Skip to content

Commit 0e899a5

Browse files
authored
Merge branch 'master' into PR_jupyterlab_2113
2 parents 8ff8e2c + 10c9768 commit 0e899a5

File tree

9 files changed

+11
-1
lines changed

9 files changed

+11
-1
lines changed

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ arch_patch/%: ## apply hardware architecture specific patches to the Dockerfile
4545
build/%: DARGS?=
4646
build/%: ## build the latest image for a stack
4747
docker build $(DARGS) --rm --force-rm -t $(OWNER)/$(notdir $@):latest ./$(notdir $@)
48+
@echo -n "Built image size: "
49+
@docker images $(OWNER)/$(notdir $@):latest --format "{{.Size}}"
4850

4951
build-all: $(foreach I,$(ALL_IMAGES),arch_patch/$(I) build/$(I) ) ## build all stacks
5052
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
125127
@if [ ! -d "$(notdir $@)/test" ]; then TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest -m "not info" test; \
126128
else TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest -m "not info" test $(notdir $@)/test; fi
127129

128-
test-all: $(foreach I,$(ALL_IMAGES),test/$(I)) ## test all stacks
130+
test-all: $(foreach I,$(ALL_IMAGES),test/$(I)) ## test all stacks

all-spark-notebook/hooks/manifest.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cat << EOF > "$MANIFEST_FILE"
22
* Build datetime: ${BUILD_TIMESTAMP}
33
* DockerHub build code: ${BUILD_CODE}
44
* Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG}
5+
* Docker image size: $(docker images ${IMAGE_NAME} --format "{{.Size}}")
56
* Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
67
* Git commit message:
78
\`\`\`

base-notebook/hooks/manifest.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cat << EOF > "$MANIFEST_FILE"
22
* Build datetime: ${BUILD_TIMESTAMP}
33
* DockerHub build code: ${BUILD_CODE}
44
* Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG}
5+
* Docker image size: $(docker images ${IMAGE_NAME} --format "{{.Size}}")
56
* Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
67
* Git commit message:
78
\`\`\`

datascience-notebook/hooks/manifest.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cat << EOF > "$MANIFEST_FILE"
22
* Build datetime: ${BUILD_TIMESTAMP}
33
* DockerHub build code: ${BUILD_CODE}
44
* Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG}
5+
* Docker image size: $(docker images ${IMAGE_NAME} --format "{{.Size}}")
56
* Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
67
* Git commit message:
78
\`\`\`

minimal-notebook/hooks/manifest.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cat << EOF > "$MANIFEST_FILE"
22
* Build datetime: ${BUILD_TIMESTAMP}
33
* DockerHub build code: ${BUILD_CODE}
44
* Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG}
5+
* Docker image size: $(docker images ${IMAGE_NAME} --format "{{.Size}}")
56
* Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
67
* Git commit message:
78
\`\`\`

pyspark-notebook/hooks/manifest.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cat << EOF > "$MANIFEST_FILE"
22
* Build datetime: ${BUILD_TIMESTAMP}
33
* DockerHub build code: ${BUILD_CODE}
44
* Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG}
5+
* Docker image size: $(docker images ${IMAGE_NAME} --format "{{.Size}}")
56
* Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
67
* Git commit message:
78
\`\`\`

r-notebook/hooks/manifest.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cat << EOF > "$MANIFEST_FILE"
22
* Build datetime: ${BUILD_TIMESTAMP}
33
* DockerHub build code: ${BUILD_CODE}
44
* Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG}
5+
* Docker image size: $(docker images ${IMAGE_NAME} --format "{{.Size}}")
56
* Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
67
* Git commit message:
78
\`\`\`

scipy-notebook/hooks/manifest.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cat << EOF > "$MANIFEST_FILE"
22
* Build datetime: ${BUILD_TIMESTAMP}
33
* DockerHub build code: ${BUILD_CODE}
44
* Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG}
5+
* Docker image size: $(docker images ${IMAGE_NAME} --format "{{.Size}}")
56
* Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
67
* Git commit message:
78
\`\`\`

tensorflow-notebook/hooks/manifest.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cat << EOF > "$MANIFEST_FILE"
22
* Build datetime: ${BUILD_TIMESTAMP}
33
* DockerHub build code: ${BUILD_CODE}
44
* Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG}
5+
* Docker image size: $(docker images ${IMAGE_NAME} --format "{{.Size}}")
56
* Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
67
* Git commit message:
78
\`\`\`

0 commit comments

Comments
 (0)