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

feat: add vscode to base image #134

Merged
merged 4 commits into from
Nov 26, 2020
Merged

feat: add vscode to base image #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c43683d
feat: add vscode to base image
rokroskar Nov 13, 2020
045588f
chore: update Makefile for new structure
rokroskar Nov 25, 2020
c50af19
build: move vscode install to a script
rokroskar Nov 25, 2020
55068d4
chore: clean apt cache
rokroskar Nov 26, 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
9 changes: 3 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,26 +62,23 @@ pull:
docker pull $(DOCKER_PREFIX)$$ext:$(DOCKER_LABEL) ; \
done

r: py3.7
r: py
docker build docker/r \
--build-arg RENKU_PIP_SPEC=$(RENKU_PIP_SPEC) \
--build-arg RENKU_BASE=renku/renkulab-py3.7:$(GIT_MASTER_HEAD_SHA)$(RENKU_TAG) \
--build-arg RVERSION=$(RVERSION) \
-t $(DOCKER_PREFIX)-r:$(DOCKER_LABEL)$(RENKU_TAG)$(R_TAG) && \
docker tag $(DOCKER_PREFIX)-r:$(DOCKER_LABEL)$(RENKU_TAG)$(R_TAG) $(DOCKER_PREFIX)-r:$(GIT_MASTER_HEAD_SHA)$(RENKU_TAG)$(R_TAG)

bioc: py3.7
bioc: py
docker build docker/bioc \
--build-arg RENKU_PIP_SPEC=$(RENKU_PIP_SPEC) \
--build-arg RENKU_BASE=renku/renkulab-py3.7:$(GIT_MASTER_HEAD_SHA)$(RENKU_TAG) \
--build-arg RELEASE=$(BIOC_VERSION) \
-t $(DOCKER_PREFIX)-bioc:$(DOCKER_LABEL)$(RENKU_TAG)$(BIOC_TAG) && \
docker tag $(DOCKER_PREFIX)-bioc:$(DOCKER_LABEL)$(RENKU_TAG)$(BIOC_TAG) $(DOCKER_PREFIX)-bioc:$(GIT_MASTER_HEAD_SHA)$(RENKU_TAG)$(BIOC_TAG)


py3.7:
py:
cd docker/$@ && \
docker build \
--build-arg RENKU_PIP_SPEC=${RENKU_PIP_SPEC} \
-t $(DOCKER_PREFIX)-$@:$(DOCKER_LABEL)$(RENKU_TAG) . && \
docker tag $(DOCKER_PREFIX)-$@:$(DOCKER_LABEL)$(RENKU_TAG) $(DOCKER_PREFIX)-$@:$(GIT_MASTER_HEAD_SHA)$(RENKU_TAG)
9 changes: 6 additions & 3 deletions docker/py/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
papermill==2.1.3
requests>=2.20.0
jupyterhub==1.1.0
nbresuse==0.3.6
jupyterlab-git==0.20.0
jupyterlab_server~=1.0.0
jupyter-server-proxy==1.5.0
nbresuse==0.3.6
nbclient<0.5.1
papermill==2.1.3
pipx>=0.15.0.0
powerline-shell==0.7.0
requests>=2.20.0
16 changes: 16 additions & 0 deletions scripts/install-vscode.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/sh

VSCODE_VERSION=${VSCODE_VERSION:="3.6.2"}

# code-server installation
wget https://github.com/cdr/code-server/releases/download/v${VSCODE_VERSION}/code-server_3.6.2_amd64.deb
dpkg -i ./code-server*.deb
rm code-server_3.6.2_amd64.deb
apt-get clean
code-server --install-extension ms-python.python
chown -R 1000:1000 /home/${NB_USER}/.local/share

# Jupyter support
pip install git+https://github.com/betatim/vscode-binder
jupyter serverextension enable --py jupyter_server_proxy && \
jupyter labextension install --no-build @jupyterlab/server-proxy