Skip to content

Commit

Permalink
Introduce a common set of files to be copied into the built image that
Browse files Browse the repository at this point in the history
initally will be used for Jupyterhub user initialization.
  • Loading branch information
mcduffie committed Feb 16, 2024
1 parent 8950c5b commit 70fcca3
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
DOCKER_GROUP=unity-sds
DOCKER_TAG=v0.2.2
DOCKER_TAG=v0.2.3
4 changes: 3 additions & 1 deletion .github/workflows/build-stacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ jobs:
# Note that sounder_sips_dev is left out because it takes a large amount of resources to run
#
# In the filters below, the key should be the same as the directory name of the Stack
# Additionally, the Dockerfile in the stack directory should work from the root context
# to allow inclusion of common files
filters: |
unity_datascience:
- 'unity_datascience/**'
Expand Down Expand Up @@ -114,7 +116,7 @@ jobs:
id: build-and-push
uses: docker/build-push-action@v5
with:
context: ${{ matrix.stack }}
file: ${{ matrix.stack }}/Dockerfile
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
Expand Down
2 changes: 2 additions & 0 deletions common/unity-sds/jupyter_skel/.condarc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
envs_dirs:
- /home/jovyan/conda-envs/
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ services:
image: ${DOCKER_GROUP}/datascience:${DOCKER_TAG}
hostname: local
build:
context: unity_datascience
context: ./
dockerfile: $PWD/unity_datascience/Dockerfile
3 changes: 3 additions & 0 deletions unity_datascience/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ FROM jupyter/datascience-notebook
# Switch to root user for build
USER root

# Requires the build context to be one level up where common is located
COPY common/unity-sds /etc/unity-sds

# Install Dockstore
RUN apt-get update -q && \
apt install -y openjdk-11-jdk && \
Expand Down

0 comments on commit 70fcca3

Please sign in to comment.