Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: restore makefile commands #82

Merged
merged 3 commits into from
Apr 6, 2020
+4 −4
Merged

fix: restore makefile commands #82

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae8a178
fix: restore makefile commands
lorenzo-cavazzi Mar 4, 2020
3e08f9d
fix: adjust docker prefix
lorenzo-cavazzi Mar 5, 2020
a7ddc6c
Merge branch 'master' into 81-fix-makefile
emmjab Apr 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
# limitations under the License.

extensions = \
r-bioconductor_3_10 r \
cuda-9.2 cuda-10.0-tensorflow-1.14
bioc3_10 r3.6.1 \
cuda9.2 cuda10.0-tf1.14

DOCKER_PREFIX?=renku/singleuser
DOCKER_PREFIX?=renku/renkulab
DOCKER_LABEL?=latest
JUPYTERHUB_VERSION?=1.2
GIT_MASTER_HEAD_SHA:=$(shell git rev-parse --short=7 --verify HEAD)
Expand All @@ -37,7 +37,7 @@ endif
all: base $(extensions)

base:
docker build docker/base \
docker build docker/py3.7 \
--build-arg RENKU_PIP_SPEC=$(RENKU_PIP_SPEC) \
--build-arg JUPYTERHUB_VERSION=$(JUPYTERHUB_VERSION) \
-t $(DOCKER_PREFIX):$(DOCKER_LABEL)$(RENKU_TAG) && \
Expand Down