You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by ch...@apache.org on 2016/10/01 02:41:25 UTC
[1/2] incubator-toree git commit: Interactive is not needed for
builds and it interferes with non tty builds such as Jenkins
Repository: incubator-toree
Updated Branches:
refs/heads/master 7c1bfb6df -> a0f75a1c0
Interactive is not needed for builds and it interferes with non tty builds such as Jenkins
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/29b3ace3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/29b3ace3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/29b3ace3
Branch: refs/heads/master
Commit: 29b3ace357141dbfea44e20d13f9e4218c98fd27
Parents: 7c1bfb6
Author: Petros Rizos <pe...@quantumblack.com>
Authored: Thu Sep 29 18:20:06 2016 +0100
Committer: Petros Rizos <pe...@quantumblack.com>
Committed: Thu Sep 29 18:20:06 2016 +0100
----------------------------------------------------------------------
Makefile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/29b3ace3/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 27fd077..03dadc1 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ BINDER_IMAGE?=apache/toree-binder
DOCKER_WORKDIR?=/srv/toree
DOCKER_ARGS?=
define DOCKER
-docker run -it --rm \
+docker run -t --rm \
--workdir $(DOCKER_WORKDIR) \
-e PYTHONPATH='/srv/toree' \
-v `pwd`:/srv/toree $(DOCKER_ARGS)
@@ -83,7 +83,7 @@ clean: clean-dist
.example-image: EXTRA_CMD?=printf "deb http://cran.rstudio.com/bin/linux/debian jessie-cran3/" >> /etc/apt/sources.list; apt-key adv --keyserver keys.gnupg.net --recv-key 381BA480; apt-get update; pip install jupyter_declarativewidgets==0.4.4; jupyter declarativewidgets install --user; jupyter declarativewidgets activate; pip install jupyter_dashboards; jupyter dashboards install --user; jupyter dashboards activate; apt-get update; apt-get install --yes curl; curl --silent --location https://deb.nodesource.com/setup_0.12 | sudo bash -; apt-get install --yes nodejs r-base r-base-dev; npm install -g bower;
.example-image:
@-docker rm -f examples_image
- @docker run -it --user root --name examples_image \
+ @docker run -t --user root --name examples_image \
$(IMAGE) bash -c '$(EXTRA_CMD)'
@docker commit examples_image $(EXAMPLE_IMAGE)
@-docker rm -f examples_image
@@ -91,7 +91,7 @@ clean: clean-dist
.system-test-image:
@-docker rm -f system_test_image
- @docker run -it --user root --name system_test_image \
+ @docker run -t --user root --name system_test_image \
$(IMAGE) bash -c "cd /tmp && \
wget http://apache.claz.org/spark/spark-$(APACHE_SPARK_VERSION)/spark-$(APACHE_SPARK_VERSION)-bin-hadoop2.6.tgz && \
tar xzf spark-$(APACHE_SPARK_VERSION)-bin-hadoop2.6.tgz -C /usr/local && \
@@ -121,7 +121,7 @@ clean: clean-dist
@docker build --rm -t $(BINDER_IMAGE) .
dev-binder: .binder-image
- @docker run --rm -it -p 8888:8888 \
+ @docker run --rm -t -p 8888:8888 \
-v `pwd`:/home/main/notebooks \
--workdir /home/main/notebooks $(BINDER_IMAGE) \
/home/main/start-notebook.sh --ip=0.0.0.0
@@ -208,7 +208,7 @@ jupyter: .example-image pip-release
################################################################################
system-test: pip-release .system-test-image
@echo '-- Running jupyter kernel tests'
- @docker run -ti --rm \
+ @docker run -t --rm \
--name jupyter_kernel_tests \
-v `pwd`/dist/toree-pip:/srv/toree-pip \
-v `pwd`/test_toree.py:/srv/test_toree.py \
[2/2] incubator-toree git commit: removing hard coding for gpg so it
can operate on multiple platforms
Posted by ch...@apache.org.
removing hard coding for gpg so it can operate on multiple platforms
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/a0f75a1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/a0f75a1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/a0f75a1c
Branch: refs/heads/master
Commit: a0f75a1c0e5c66d2d5787a78668d31d44ffb1be0
Parents: 29b3ace
Author: Petros Rizos <pe...@quantumblack.com>
Authored: Fri Sep 30 11:19:15 2016 +0100
Committer: Petros Rizos <pe...@quantumblack.com>
Committed: Fri Sep 30 11:19:15 2016 +0100
----------------------------------------------------------------------
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/a0f75a1c/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 03dadc1..85aed4d 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ SCALA_VERSION?=2.11
IMAGE?=jupyter/all-spark-notebook:07a7c4d6d447
EXAMPLE_IMAGE?=apache/toree-examples
SYSTEM_TEST_IMAGE?=apache/toree-systemtest
-GPG?=/usr/local/bin/gpg
+GPG?=gpg
GPG_PASSWORD?=
BINDER_IMAGE?=apache/toree-binder
DOCKER_WORKDIR?=/srv/toree