hazza/docker-stacks
1
0
Fork 0
mirror of https://github.com/jupyter/docker-stacks.git synced 2025-10-10 11:32:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into remove-mesos

Browse Source
This commit is contained in:
Peter Parente
2020-05-27 16:05:31 -04:00
committed by GitHub
parent 7431d6cf0a 1e36f7c131
commit ba6723edf1
10 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -45,6 +45,8 @@ arch_patch/%: ## apply hardware architecture specific patches to the Dockerfile
build/%: DARGS?= build/%: DARGS?=
build/%: ## build the latest image for a stack build/%: ## build the latest image for a stack
docker build $(DARGS) --rm --force-rm -t $(OWNER)/$(notdir $@):latest ./$(notdir $@) docker build $(DARGS) --rm --force-rm -t $(OWNER)/$(notdir $@):latest ./$(notdir $@)
@echo -n "Built image size: "
@docker images $(OWNER)/$(notdir $@):latest --format "{{.Size}}"
build-all: $(foreach I,$(ALL_IMAGES),arch_patch/$(I) build/$(I) ) ## build all stacks build-all: $(foreach I,$(ALL_IMAGES),arch_patch/$(I) build/$(I) ) ## build all stacks
build-test-all: $(foreach I,$(ALL_IMAGES),arch_patch/$(I) build/$(I) test/$(I) ) ## build and test all stacks build-test-all: $(foreach I,$(ALL_IMAGES),arch_patch/$(I) build/$(I) test/$(I) ) ## build and test all stacks
@@ -125,4 +127,4 @@ test/%: ## run tests against a stack (only common tests or common tests + specif
@if [ ! -d "$(notdir $@)/test" ]; then TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest -m "not info" test; \ @if [ ! -d "$(notdir $@)/test" ]; then TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest -m "not info" test; \
else TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest -m "not info" test $(notdir $@)/test; fi else TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest -m "not info" test $(notdir $@)/test; fi
test-all: $(foreach I,$(ALL_IMAGES),test/$(I)) ## test all stacks test-all: $(foreach I,$(ALL_IMAGES),test/$(I)) ## test all stacks

1
all-spark-notebook/hooks/manifest.tmpl
View File

@@ -2,6 +2,7 @@ cat << EOF > "$MANIFEST_FILE"
* Build datetime: ${BUILD_TIMESTAMP} * Build datetime: ${BUILD_TIMESTAMP}
* DockerHub build code: ${BUILD_CODE} * DockerHub build code: ${BUILD_CODE}
* Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG} * Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG}
* Docker image size: $(docker images ${IMAGE_NAME} --format "{{.Size}}")
* Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT}) * Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
* Git commit message: * Git commit message:
\`\`\` \`\`\`

2
base-notebook/Dockerfile
View File

@@ -112,7 +112,7 @@ RUN conda install --quiet --yes 'tini=0.18.0' && \
RUN conda install --quiet --yes \ RUN conda install --quiet --yes \
'notebook=6.0.3' \ 'notebook=6.0.3' \
'jupyterhub=1.1.0' \ 'jupyterhub=1.1.0' \
'jupyterlab=2.1.1' && \ 'jupyterlab=2.1.3' && \
conda clean --all -f -y && \ conda clean --all -f -y && \
npm cache clean --force && \ npm cache clean --force && \
jupyter notebook --generate-config && \ jupyter notebook --generate-config && \

1
base-notebook/hooks/manifest.tmpl
View File

@@ -2,6 +2,7 @@ cat << EOF > "$MANIFEST_FILE"
* Build datetime: ${BUILD_TIMESTAMP} * Build datetime: ${BUILD_TIMESTAMP}
* DockerHub build code: ${BUILD_CODE} * DockerHub build code: ${BUILD_CODE}
* Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG} * Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG}
* Docker image size: $(docker images ${IMAGE_NAME} --format "{{.Size}}")
* Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT}) * Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
* Git commit message: * Git commit message:
\`\`\` \`\`\`

1
datascience-notebook/hooks/manifest.tmpl
View File

@@ -2,6 +2,7 @@ cat << EOF > "$MANIFEST_FILE"
* Build datetime: ${BUILD_TIMESTAMP} * Build datetime: ${BUILD_TIMESTAMP}
* DockerHub build code: ${BUILD_CODE} * DockerHub build code: ${BUILD_CODE}
* Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG} * Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG}
* Docker image size: $(docker images ${IMAGE_NAME} --format "{{.Size}}")
* Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT}) * Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
* Git commit message: * Git commit message:
\`\`\` \`\`\`

1
minimal-notebook/hooks/manifest.tmpl
View File

@@ -2,6 +2,7 @@ cat << EOF > "$MANIFEST_FILE"
* Build datetime: ${BUILD_TIMESTAMP} * Build datetime: ${BUILD_TIMESTAMP}
* DockerHub build code: ${BUILD_CODE} * DockerHub build code: ${BUILD_CODE}
* Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG} * Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG}
* Docker image size: $(docker images ${IMAGE_NAME} --format "{{.Size}}")
* Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT}) * Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
* Git commit message: * Git commit message:
\`\`\` \`\`\`

1
pyspark-notebook/hooks/manifest.tmpl
View File

@@ -2,6 +2,7 @@ cat << EOF > "$MANIFEST_FILE"
* Build datetime: ${BUILD_TIMESTAMP} * Build datetime: ${BUILD_TIMESTAMP}
* DockerHub build code: ${BUILD_CODE} * DockerHub build code: ${BUILD_CODE}
* Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG} * Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG}
* Docker image size: $(docker images ${IMAGE_NAME} --format "{{.Size}}")
* Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT}) * Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
* Git commit message: * Git commit message:
\`\`\` \`\`\`

1
r-notebook/hooks/manifest.tmpl
View File

@@ -2,6 +2,7 @@ cat << EOF > "$MANIFEST_FILE"
* Build datetime: ${BUILD_TIMESTAMP} * Build datetime: ${BUILD_TIMESTAMP}
* DockerHub build code: ${BUILD_CODE} * DockerHub build code: ${BUILD_CODE}
* Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG} * Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG}
* Docker image size: $(docker images ${IMAGE_NAME} --format "{{.Size}}")
* Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT}) * Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
* Git commit message: * Git commit message:
\`\`\` \`\`\`

1
scipy-notebook/hooks/manifest.tmpl
View File

@@ -2,6 +2,7 @@ cat << EOF > "$MANIFEST_FILE"
* Build datetime: ${BUILD_TIMESTAMP} * Build datetime: ${BUILD_TIMESTAMP}
* DockerHub build code: ${BUILD_CODE} * DockerHub build code: ${BUILD_CODE}
* Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG} * Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG}
* Docker image size: $(docker images ${IMAGE_NAME} --format "{{.Size}}")
* Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT}) * Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
* Git commit message: * Git commit message:
\`\`\` \`\`\`

1
tensorflow-notebook/hooks/manifest.tmpl
View File

@@ -2,6 +2,7 @@ cat << EOF > "$MANIFEST_FILE"
* Build datetime: ${BUILD_TIMESTAMP} * Build datetime: ${BUILD_TIMESTAMP}
* DockerHub build code: ${BUILD_CODE} * DockerHub build code: ${BUILD_CODE}
* Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG} * Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG}
* Docker image size: $(docker images ${IMAGE_NAME} --format "{{.Size}}")
* Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT}) * Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
* Git commit message: * Git commit message:
\`\`\` \`\`\`