Skip to content

Commit

Permalink
updates on docker build, remove notebooks
Browse files Browse the repository at this point in the history
  • Loading branch information
boecklic committed Mar 18, 2019
1 parent c017279 commit 5bb9f5b
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 127,773 deletions.
9 changes: 7 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,19 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
curl \
gpg \
libgdal-dev \
nodejs
nodejs && \
apt-get clean

# Create unprivileged user
# ------------------------
# The gosu and entrypoint magic is used to create an unprivileged user
# at `docker run`-time with the same uid as the host user. Thus, the mounted
# host volume has the correct uid:guid permissions. For details:
# https://denibertovic.com/posts/handling-permissions-with-docker-volumes/
# Note: the --no-tty is necessary due to a bug
# https://github.com/nodejs/docker-node/issues/922
RUN gpg --no-tty --keyserver pgp.mit.edu --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
#RUN gpg --no-tty --keyserver pgp.mit.edu --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.4/gosu-$(dpkg --print-architecture)" \
&& curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/1.4/gosu-$(dpkg --print-architecture).asc" \
&& gpg --verify /usr/local/bin/gosu.asc \
Expand All @@ -35,6 +39,7 @@ RUN chmod +x /usr/local/bin/entrypoint.sh

ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]


# Install required python dependencies
# ------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CMD ?=

.PHONY: build
build:
$(DOCKER) build -t jupylab .
$(DOCKER) build -t $(DOCKERHUB_USER)/jupylab\:latest .

.PHONY: push
push: build
Expand All @@ -25,4 +25,4 @@ run:
# the container
$(DOCKER) run -it --init -p 8888:8888 \
-e LOCAL_UID=$(LOCAL_UID) \
-v $(PWD):/home/user boecklic/jupylab\:latest $(CMD)
-v $(PWD):/home/user $(DOCKERHUB_USER)/jupylab\:latest $(CMD)
1,372 changes: 0 additions & 1,372 deletions apiexploration.ipynb

This file was deleted.

1 change: 1 addition & 0 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ USER_ID=${LOCAL_UID:-1000}
echo "Starting with UID : $USER_ID"
useradd --shell /bin/bash -u $USER_ID -o -c "" -m user
export HOME=/home/user
echo "$(ls -l /home)"

exec /usr/local/bin/gosu user "$@"
Loading

0 comments on commit 5bb9f5b

Please sign in to comment.