From 243da296a1e085317b5448d1c83141b644108e22 Mon Sep 17 00:00:00 2001 From: Peter Parente Date: Fri, 15 Mar 2019 18:21:22 -0400 Subject: [PATCH 1/4] [ci skip] Add language versions, conda info, fix spark info --- all-spark-notebook/hooks/manifest.tmpl | 22 ++++++++++++++++++++-- base-notebook/hooks/manifest.tmpl | 8 ++++++++ datascience-notebook/hooks/manifest.tmpl | 16 ++++++++++++++++ minimal-notebook/hooks/manifest.tmpl | 8 ++++++++ pyspark-notebook/hooks/manifest.tmpl | 12 ++++++++++-- r-notebook/hooks/manifest.tmpl | 12 ++++++++++++ scipy-notebook/hooks/manifest.tmpl | 8 ++++++++ tensorflow-notebook/hooks/manifest.tmpl | 8 ++++++++ 8 files changed, 90 insertions(+), 4 deletions(-) diff --git a/all-spark-notebook/hooks/manifest.tmpl b/all-spark-notebook/hooks/manifest.tmpl index 42d822e4c6..efd778911d 100644 --- a/all-spark-notebook/hooks/manifest.tmpl +++ b/all-spark-notebook/hooks/manifest.tmpl @@ -8,18 +8,36 @@ cat << EOF > "$MANIFEST_FILE" ${COMMIT_MSG} \`\`\` -## Apache Packages +## Apache Spark \`\`\` -$(docker run --rm ${IMAGE_NAME} spark-submit --version) +$(docker run --rm ${IMAGE_NAME} spark-submit --version 2>&1) \`\`\` ## Python Packages +\`\`\` +$(docker run --rm ${IMAGE_NAME} python --version) +\`\`\` + +\`\`\` +$(docker run --rm ${IMAGE_NAME} conda info) +\`\`\` + \`\`\` $(docker run --rm ${IMAGE_NAME} conda list) \`\`\` +## R Packages + +\`\`\` +$(docker run --rm ${IMAGE_NAME} R --version) +\`\`\` + +\`\`\` +$(docker run --rm ${IMAGE_NAME} R --silent -e 'installed.packages(.Library)[, c(1,3)]') +\`\`\` + ## Apt Packages \`\`\` diff --git a/base-notebook/hooks/manifest.tmpl b/base-notebook/hooks/manifest.tmpl index 6fdbc421a8..f08a06ea10 100644 --- a/base-notebook/hooks/manifest.tmpl +++ b/base-notebook/hooks/manifest.tmpl @@ -10,6 +10,14 @@ ${COMMIT_MSG} ## Python Packages +\`\`\` +$(docker run --rm ${IMAGE_NAME} python --version) +\`\`\` + +\`\`\` +$(docker run --rm ${IMAGE_NAME} conda info) +\`\`\` + \`\`\` $(docker run --rm ${IMAGE_NAME} conda list) \`\`\` diff --git a/datascience-notebook/hooks/manifest.tmpl b/datascience-notebook/hooks/manifest.tmpl index 36bf75c397..351031ddae 100644 --- a/datascience-notebook/hooks/manifest.tmpl +++ b/datascience-notebook/hooks/manifest.tmpl @@ -10,18 +10,34 @@ ${COMMIT_MSG} ## Julia Packages +\`\`\` +$(docker run --rm ${IMAGE_NAME} julia -E 'using InteractiveUtils; versioninfo()') +\`\`\` + \`\`\` $(docker run --rm ${IMAGE_NAME} julia -E 'import Pkg; Pkg.status()') \`\`\` ## Python Packages +\`\`\` +$(docker run --rm ${IMAGE_NAME} python --version) +\`\`\` + +\`\`\` +$(docker run --rm ${IMAGE_NAME} conda info) +\`\`\` + \`\`\` $(docker run --rm ${IMAGE_NAME} conda list) \`\`\` ## R Packages +\`\`\` +$(docker run --rm ${IMAGE_NAME} R --version) +\`\`\` + \`\`\` $(docker run --rm ${IMAGE_NAME} R --silent -e 'installed.packages(.Library)[, c(1,3)]') \`\`\` diff --git a/minimal-notebook/hooks/manifest.tmpl b/minimal-notebook/hooks/manifest.tmpl index 6fdbc421a8..f08a06ea10 100644 --- a/minimal-notebook/hooks/manifest.tmpl +++ b/minimal-notebook/hooks/manifest.tmpl @@ -10,6 +10,14 @@ ${COMMIT_MSG} ## Python Packages +\`\`\` +$(docker run --rm ${IMAGE_NAME} python --version) +\`\`\` + +\`\`\` +$(docker run --rm ${IMAGE_NAME} conda info) +\`\`\` + \`\`\` $(docker run --rm ${IMAGE_NAME} conda list) \`\`\` diff --git a/pyspark-notebook/hooks/manifest.tmpl b/pyspark-notebook/hooks/manifest.tmpl index 42d822e4c6..83dad80d34 100644 --- a/pyspark-notebook/hooks/manifest.tmpl +++ b/pyspark-notebook/hooks/manifest.tmpl @@ -8,14 +8,22 @@ cat << EOF > "$MANIFEST_FILE" ${COMMIT_MSG} \`\`\` -## Apache Packages +## Apache Spark \`\`\` -$(docker run --rm ${IMAGE_NAME} spark-submit --version) +$(docker run --rm ${IMAGE_NAME} spark-submit --version 2>&1) \`\`\` ## Python Packages +\`\`\` +$(docker run --rm ${IMAGE_NAME} python --version) +\`\`\` + +\`\`\` +$(docker run --rm ${IMAGE_NAME} conda info) +\`\`\` + \`\`\` $(docker run --rm ${IMAGE_NAME} conda list) \`\`\` diff --git a/r-notebook/hooks/manifest.tmpl b/r-notebook/hooks/manifest.tmpl index ad78696373..a753214e18 100644 --- a/r-notebook/hooks/manifest.tmpl +++ b/r-notebook/hooks/manifest.tmpl @@ -10,12 +10,24 @@ ${COMMIT_MSG} ## R Packages +\`\`\` +$(docker run --rm ${IMAGE_NAME} R --version) +\`\`\` + \`\`\` $(docker run --rm ${IMAGE_NAME} R --silent -e 'installed.packages(.Library)[, c(1,3)]') \`\`\` ## Python Packages +\`\`\` +$(docker run --rm ${IMAGE_NAME} python --version) +\`\`\` + +\`\`\` +$(docker run --rm ${IMAGE_NAME} conda info) +\`\`\` + \`\`\` $(docker run --rm ${IMAGE_NAME} conda list) \`\`\` diff --git a/scipy-notebook/hooks/manifest.tmpl b/scipy-notebook/hooks/manifest.tmpl index 6fdbc421a8..f08a06ea10 100644 --- a/scipy-notebook/hooks/manifest.tmpl +++ b/scipy-notebook/hooks/manifest.tmpl @@ -10,6 +10,14 @@ ${COMMIT_MSG} ## Python Packages +\`\`\` +$(docker run --rm ${IMAGE_NAME} python --version) +\`\`\` + +\`\`\` +$(docker run --rm ${IMAGE_NAME} conda info) +\`\`\` + \`\`\` $(docker run --rm ${IMAGE_NAME} conda list) \`\`\` diff --git a/tensorflow-notebook/hooks/manifest.tmpl b/tensorflow-notebook/hooks/manifest.tmpl index 6fdbc421a8..f08a06ea10 100644 --- a/tensorflow-notebook/hooks/manifest.tmpl +++ b/tensorflow-notebook/hooks/manifest.tmpl @@ -10,6 +10,14 @@ ${COMMIT_MSG} ## Python Packages +\`\`\` +$(docker run --rm ${IMAGE_NAME} python --version) +\`\`\` + +\`\`\` +$(docker run --rm ${IMAGE_NAME} conda info) +\`\`\` + \`\`\` $(docker run --rm ${IMAGE_NAME} conda list) \`\`\` From 3339b63abfc95beaf76847bf71c5ebeff440b47f Mon Sep 17 00:00:00 2001 From: Peter Parente Date: Sat, 16 Mar 2019 22:03:13 -0400 Subject: [PATCH 2/4] [ci skip] Add row to build index after every image push --- all-spark-notebook/hooks/index.tmpl | 2 ++ all-spark-notebook/hooks/manifest.tmpl | 2 +- all-spark-notebook/hooks/post_push | 5 ++++- base-notebook/hooks/index.tmpl | 2 ++ base-notebook/hooks/manifest.tmpl | 2 +- base-notebook/hooks/post_push | 5 ++++- datascience-notebook/hooks/index.tmpl | 2 ++ datascience-notebook/hooks/manifest.tmpl | 2 +- datascience-notebook/hooks/post_push | 5 ++++- minimal-notebook/hooks/index.tmpl | 2 ++ minimal-notebook/hooks/manifest.tmpl | 2 +- minimal-notebook/hooks/post_push | 5 ++++- pyspark-notebook/hooks/index.tmpl | 2 ++ pyspark-notebook/hooks/manifest.tmpl | 2 +- pyspark-notebook/hooks/post_push | 5 ++++- r-notebook/hooks/index.tmpl | 2 ++ r-notebook/hooks/manifest.tmpl | 2 +- r-notebook/hooks/post_push | 5 ++++- scipy-notebook/hooks/index.tmpl | 2 ++ scipy-notebook/hooks/manifest.tmpl | 2 +- scipy-notebook/hooks/post_push | 5 ++++- tensorflow-notebook/hooks/index.tmpl | 2 ++ tensorflow-notebook/hooks/manifest.tmpl | 2 +- tensorflow-notebook/hooks/post_push | 5 ++++- 24 files changed, 56 insertions(+), 16 deletions(-) create mode 100644 all-spark-notebook/hooks/index.tmpl create mode 100644 base-notebook/hooks/index.tmpl create mode 100644 datascience-notebook/hooks/index.tmpl create mode 100644 minimal-notebook/hooks/index.tmpl create mode 100644 pyspark-notebook/hooks/index.tmpl create mode 100644 r-notebook/hooks/index.tmpl create mode 100644 scipy-notebook/hooks/index.tmpl create mode 100644 tensorflow-notebook/hooks/index.tmpl diff --git a/all-spark-notebook/hooks/index.tmpl b/all-spark-notebook/hooks/index.tmpl new file mode 100644 index 0000000000..2a9853d0e7 --- /dev/null +++ b/all-spark-notebook/hooks/index.tmpl @@ -0,0 +1,2 @@ +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|${GIT_SHA_TAG}|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/all-spark-notebook/hooks/manifest.tmpl b/all-spark-notebook/hooks/manifest.tmpl index efd778911d..edccc003eb 100644 --- a/all-spark-notebook/hooks/manifest.tmpl +++ b/all-spark-notebook/hooks/manifest.tmpl @@ -1,5 +1,5 @@ cat << EOF > "$MANIFEST_FILE" -* Build datetime: $(date -u +%FT%TZ) +* Build datetime: ${BUILD_TIMESTAMP} * DockerHub build code: ${BUILD_CODE} * Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG} * Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT}) diff --git a/all-spark-notebook/hooks/post_push b/all-spark-notebook/hooks/post_push index 5bcea91748..901e8b1750 100755 --- a/all-spark-notebook/hooks/post_push +++ b/all-spark-notebook/hooks/post_push @@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG docker push $DOCKER_REPO:$GIT_SHA_TAG # Create a working directory. +BUILD_TIMESTAMP=$(date -u +%FT%TZ) WORKDIR=$(mktemp -d) GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git" GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki" IMAGE_SHORT_NAME=$(basename $DOCKER_REPO) -MANIFEST_FILE="${GIT_SANDBOX}/manifests/${IMAGE_SHORT_NAME}-${SOURCE_COMMIT:0:12}.md" +MANIFEST_FILE="${GIT_SANDBOX}/manifests/${IMAGE_SHORT_NAME}-${GIT_SHA_TAG}.md" +INDEX_FILE="${GIT_SANDBOX}/Home.md" # Configure git so it can push back to GitHub. eval $(ssh-agent -s) @@ -29,6 +31,7 @@ popd # Render the build manifest template. mkdir -p $(dirname "$MANIFEST_FILE") source hooks/manifest.tmpl +source hooks/index.tmpl # Push the wiki update back to GitHub. pushd "$GIT_SANDBOX" diff --git a/base-notebook/hooks/index.tmpl b/base-notebook/hooks/index.tmpl new file mode 100644 index 0000000000..2a9853d0e7 --- /dev/null +++ b/base-notebook/hooks/index.tmpl @@ -0,0 +1,2 @@ +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|${GIT_SHA_TAG}|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/base-notebook/hooks/manifest.tmpl b/base-notebook/hooks/manifest.tmpl index f08a06ea10..a8327f8fa7 100644 --- a/base-notebook/hooks/manifest.tmpl +++ b/base-notebook/hooks/manifest.tmpl @@ -1,5 +1,5 @@ cat << EOF > "$MANIFEST_FILE" -* Build datetime: $(date -u +%FT%TZ) +* Build datetime: ${BUILD_TIMESTAMP} * DockerHub build code: ${BUILD_CODE} * Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG} * Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT}) diff --git a/base-notebook/hooks/post_push b/base-notebook/hooks/post_push index 5bcea91748..901e8b1750 100755 --- a/base-notebook/hooks/post_push +++ b/base-notebook/hooks/post_push @@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG docker push $DOCKER_REPO:$GIT_SHA_TAG # Create a working directory. +BUILD_TIMESTAMP=$(date -u +%FT%TZ) WORKDIR=$(mktemp -d) GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git" GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki" IMAGE_SHORT_NAME=$(basename $DOCKER_REPO) -MANIFEST_FILE="${GIT_SANDBOX}/manifests/${IMAGE_SHORT_NAME}-${SOURCE_COMMIT:0:12}.md" +MANIFEST_FILE="${GIT_SANDBOX}/manifests/${IMAGE_SHORT_NAME}-${GIT_SHA_TAG}.md" +INDEX_FILE="${GIT_SANDBOX}/Home.md" # Configure git so it can push back to GitHub. eval $(ssh-agent -s) @@ -29,6 +31,7 @@ popd # Render the build manifest template. mkdir -p $(dirname "$MANIFEST_FILE") source hooks/manifest.tmpl +source hooks/index.tmpl # Push the wiki update back to GitHub. pushd "$GIT_SANDBOX" diff --git a/datascience-notebook/hooks/index.tmpl b/datascience-notebook/hooks/index.tmpl new file mode 100644 index 0000000000..2a9853d0e7 --- /dev/null +++ b/datascience-notebook/hooks/index.tmpl @@ -0,0 +1,2 @@ +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|${GIT_SHA_TAG}|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/datascience-notebook/hooks/manifest.tmpl b/datascience-notebook/hooks/manifest.tmpl index 351031ddae..37e93dab84 100644 --- a/datascience-notebook/hooks/manifest.tmpl +++ b/datascience-notebook/hooks/manifest.tmpl @@ -1,5 +1,5 @@ cat << EOF > "$MANIFEST_FILE" -* Build datetime: $(date -u +%FT%TZ) +* Build datetime: ${BUILD_TIMESTAMP} * DockerHub build code: ${BUILD_CODE} * Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG} * Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT}) diff --git a/datascience-notebook/hooks/post_push b/datascience-notebook/hooks/post_push index 5bcea91748..901e8b1750 100755 --- a/datascience-notebook/hooks/post_push +++ b/datascience-notebook/hooks/post_push @@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG docker push $DOCKER_REPO:$GIT_SHA_TAG # Create a working directory. +BUILD_TIMESTAMP=$(date -u +%FT%TZ) WORKDIR=$(mktemp -d) GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git" GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki" IMAGE_SHORT_NAME=$(basename $DOCKER_REPO) -MANIFEST_FILE="${GIT_SANDBOX}/manifests/${IMAGE_SHORT_NAME}-${SOURCE_COMMIT:0:12}.md" +MANIFEST_FILE="${GIT_SANDBOX}/manifests/${IMAGE_SHORT_NAME}-${GIT_SHA_TAG}.md" +INDEX_FILE="${GIT_SANDBOX}/Home.md" # Configure git so it can push back to GitHub. eval $(ssh-agent -s) @@ -29,6 +31,7 @@ popd # Render the build manifest template. mkdir -p $(dirname "$MANIFEST_FILE") source hooks/manifest.tmpl +source hooks/index.tmpl # Push the wiki update back to GitHub. pushd "$GIT_SANDBOX" diff --git a/minimal-notebook/hooks/index.tmpl b/minimal-notebook/hooks/index.tmpl new file mode 100644 index 0000000000..2a9853d0e7 --- /dev/null +++ b/minimal-notebook/hooks/index.tmpl @@ -0,0 +1,2 @@ +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|${GIT_SHA_TAG}|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/minimal-notebook/hooks/manifest.tmpl b/minimal-notebook/hooks/manifest.tmpl index f08a06ea10..a8327f8fa7 100644 --- a/minimal-notebook/hooks/manifest.tmpl +++ b/minimal-notebook/hooks/manifest.tmpl @@ -1,5 +1,5 @@ cat << EOF > "$MANIFEST_FILE" -* Build datetime: $(date -u +%FT%TZ) +* Build datetime: ${BUILD_TIMESTAMP} * DockerHub build code: ${BUILD_CODE} * Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG} * Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT}) diff --git a/minimal-notebook/hooks/post_push b/minimal-notebook/hooks/post_push index 5bcea91748..901e8b1750 100755 --- a/minimal-notebook/hooks/post_push +++ b/minimal-notebook/hooks/post_push @@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG docker push $DOCKER_REPO:$GIT_SHA_TAG # Create a working directory. +BUILD_TIMESTAMP=$(date -u +%FT%TZ) WORKDIR=$(mktemp -d) GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git" GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki" IMAGE_SHORT_NAME=$(basename $DOCKER_REPO) -MANIFEST_FILE="${GIT_SANDBOX}/manifests/${IMAGE_SHORT_NAME}-${SOURCE_COMMIT:0:12}.md" +MANIFEST_FILE="${GIT_SANDBOX}/manifests/${IMAGE_SHORT_NAME}-${GIT_SHA_TAG}.md" +INDEX_FILE="${GIT_SANDBOX}/Home.md" # Configure git so it can push back to GitHub. eval $(ssh-agent -s) @@ -29,6 +31,7 @@ popd # Render the build manifest template. mkdir -p $(dirname "$MANIFEST_FILE") source hooks/manifest.tmpl +source hooks/index.tmpl # Push the wiki update back to GitHub. pushd "$GIT_SANDBOX" diff --git a/pyspark-notebook/hooks/index.tmpl b/pyspark-notebook/hooks/index.tmpl new file mode 100644 index 0000000000..2a9853d0e7 --- /dev/null +++ b/pyspark-notebook/hooks/index.tmpl @@ -0,0 +1,2 @@ +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|${GIT_SHA_TAG}|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/pyspark-notebook/hooks/manifest.tmpl b/pyspark-notebook/hooks/manifest.tmpl index 83dad80d34..9f04ec8508 100644 --- a/pyspark-notebook/hooks/manifest.tmpl +++ b/pyspark-notebook/hooks/manifest.tmpl @@ -1,5 +1,5 @@ cat << EOF > "$MANIFEST_FILE" -* Build datetime: $(date -u +%FT%TZ) +* Build datetime: ${BUILD_TIMESTAMP} * DockerHub build code: ${BUILD_CODE} * Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG} * Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT}) diff --git a/pyspark-notebook/hooks/post_push b/pyspark-notebook/hooks/post_push index 5bcea91748..901e8b1750 100755 --- a/pyspark-notebook/hooks/post_push +++ b/pyspark-notebook/hooks/post_push @@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG docker push $DOCKER_REPO:$GIT_SHA_TAG # Create a working directory. +BUILD_TIMESTAMP=$(date -u +%FT%TZ) WORKDIR=$(mktemp -d) GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git" GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki" IMAGE_SHORT_NAME=$(basename $DOCKER_REPO) -MANIFEST_FILE="${GIT_SANDBOX}/manifests/${IMAGE_SHORT_NAME}-${SOURCE_COMMIT:0:12}.md" +MANIFEST_FILE="${GIT_SANDBOX}/manifests/${IMAGE_SHORT_NAME}-${GIT_SHA_TAG}.md" +INDEX_FILE="${GIT_SANDBOX}/Home.md" # Configure git so it can push back to GitHub. eval $(ssh-agent -s) @@ -29,6 +31,7 @@ popd # Render the build manifest template. mkdir -p $(dirname "$MANIFEST_FILE") source hooks/manifest.tmpl +source hooks/index.tmpl # Push the wiki update back to GitHub. pushd "$GIT_SANDBOX" diff --git a/r-notebook/hooks/index.tmpl b/r-notebook/hooks/index.tmpl new file mode 100644 index 0000000000..2a9853d0e7 --- /dev/null +++ b/r-notebook/hooks/index.tmpl @@ -0,0 +1,2 @@ +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|${GIT_SHA_TAG}|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/r-notebook/hooks/manifest.tmpl b/r-notebook/hooks/manifest.tmpl index a753214e18..5bc37b45b8 100644 --- a/r-notebook/hooks/manifest.tmpl +++ b/r-notebook/hooks/manifest.tmpl @@ -1,5 +1,5 @@ cat << EOF > "$MANIFEST_FILE" -* Build datetime: $(date -u +%FT%TZ) +* Build datetime: ${BUILD_TIMESTAMP} * DockerHub build code: ${BUILD_CODE} * Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG} * Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT}) diff --git a/r-notebook/hooks/post_push b/r-notebook/hooks/post_push index 5bcea91748..901e8b1750 100755 --- a/r-notebook/hooks/post_push +++ b/r-notebook/hooks/post_push @@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG docker push $DOCKER_REPO:$GIT_SHA_TAG # Create a working directory. +BUILD_TIMESTAMP=$(date -u +%FT%TZ) WORKDIR=$(mktemp -d) GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git" GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki" IMAGE_SHORT_NAME=$(basename $DOCKER_REPO) -MANIFEST_FILE="${GIT_SANDBOX}/manifests/${IMAGE_SHORT_NAME}-${SOURCE_COMMIT:0:12}.md" +MANIFEST_FILE="${GIT_SANDBOX}/manifests/${IMAGE_SHORT_NAME}-${GIT_SHA_TAG}.md" +INDEX_FILE="${GIT_SANDBOX}/Home.md" # Configure git so it can push back to GitHub. eval $(ssh-agent -s) @@ -29,6 +31,7 @@ popd # Render the build manifest template. mkdir -p $(dirname "$MANIFEST_FILE") source hooks/manifest.tmpl +source hooks/index.tmpl # Push the wiki update back to GitHub. pushd "$GIT_SANDBOX" diff --git a/scipy-notebook/hooks/index.tmpl b/scipy-notebook/hooks/index.tmpl new file mode 100644 index 0000000000..2a9853d0e7 --- /dev/null +++ b/scipy-notebook/hooks/index.tmpl @@ -0,0 +1,2 @@ +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|${GIT_SHA_TAG}|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/scipy-notebook/hooks/manifest.tmpl b/scipy-notebook/hooks/manifest.tmpl index f08a06ea10..a8327f8fa7 100644 --- a/scipy-notebook/hooks/manifest.tmpl +++ b/scipy-notebook/hooks/manifest.tmpl @@ -1,5 +1,5 @@ cat << EOF > "$MANIFEST_FILE" -* Build datetime: $(date -u +%FT%TZ) +* Build datetime: ${BUILD_TIMESTAMP} * DockerHub build code: ${BUILD_CODE} * Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG} * Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT}) diff --git a/scipy-notebook/hooks/post_push b/scipy-notebook/hooks/post_push index 5bcea91748..901e8b1750 100755 --- a/scipy-notebook/hooks/post_push +++ b/scipy-notebook/hooks/post_push @@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG docker push $DOCKER_REPO:$GIT_SHA_TAG # Create a working directory. +BUILD_TIMESTAMP=$(date -u +%FT%TZ) WORKDIR=$(mktemp -d) GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git" GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki" IMAGE_SHORT_NAME=$(basename $DOCKER_REPO) -MANIFEST_FILE="${GIT_SANDBOX}/manifests/${IMAGE_SHORT_NAME}-${SOURCE_COMMIT:0:12}.md" +MANIFEST_FILE="${GIT_SANDBOX}/manifests/${IMAGE_SHORT_NAME}-${GIT_SHA_TAG}.md" +INDEX_FILE="${GIT_SANDBOX}/Home.md" # Configure git so it can push back to GitHub. eval $(ssh-agent -s) @@ -29,6 +31,7 @@ popd # Render the build manifest template. mkdir -p $(dirname "$MANIFEST_FILE") source hooks/manifest.tmpl +source hooks/index.tmpl # Push the wiki update back to GitHub. pushd "$GIT_SANDBOX" diff --git a/tensorflow-notebook/hooks/index.tmpl b/tensorflow-notebook/hooks/index.tmpl new file mode 100644 index 0000000000..2a9853d0e7 --- /dev/null +++ b/tensorflow-notebook/hooks/index.tmpl @@ -0,0 +1,2 @@ +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|${GIT_SHA_TAG}|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/tensorflow-notebook/hooks/manifest.tmpl b/tensorflow-notebook/hooks/manifest.tmpl index f08a06ea10..a8327f8fa7 100644 --- a/tensorflow-notebook/hooks/manifest.tmpl +++ b/tensorflow-notebook/hooks/manifest.tmpl @@ -1,5 +1,5 @@ cat << EOF > "$MANIFEST_FILE" -* Build datetime: $(date -u +%FT%TZ) +* Build datetime: ${BUILD_TIMESTAMP} * DockerHub build code: ${BUILD_CODE} * Docker image: ${DOCKER_REPO}:${GIT_SHA_TAG} * Git commit SHA: [${SOURCE_COMMIT}](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT}) diff --git a/tensorflow-notebook/hooks/post_push b/tensorflow-notebook/hooks/post_push index 5bcea91748..901e8b1750 100755 --- a/tensorflow-notebook/hooks/post_push +++ b/tensorflow-notebook/hooks/post_push @@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG docker push $DOCKER_REPO:$GIT_SHA_TAG # Create a working directory. +BUILD_TIMESTAMP=$(date -u +%FT%TZ) WORKDIR=$(mktemp -d) GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git" GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki" IMAGE_SHORT_NAME=$(basename $DOCKER_REPO) -MANIFEST_FILE="${GIT_SANDBOX}/manifests/${IMAGE_SHORT_NAME}-${SOURCE_COMMIT:0:12}.md" +MANIFEST_FILE="${GIT_SANDBOX}/manifests/${IMAGE_SHORT_NAME}-${GIT_SHA_TAG}.md" +INDEX_FILE="${GIT_SANDBOX}/Home.md" # Configure git so it can push back to GitHub. eval $(ssh-agent -s) @@ -29,6 +31,7 @@ popd # Render the build manifest template. mkdir -p $(dirname "$MANIFEST_FILE") source hooks/manifest.tmpl +source hooks/index.tmpl # Push the wiki update back to GitHub. pushd "$GIT_SANDBOX" From 4667cffc41a57fdcc6238775ddc910fd37177e2f Mon Sep 17 00:00:00 2001 From: Peter Parente Date: Sat, 16 Mar 2019 22:31:10 -0400 Subject: [PATCH 3/4] [ci skip] List full image name and tag --- all-spark-notebook/hooks/index.tmpl | 2 +- base-notebook/hooks/index.tmpl | 2 +- datascience-notebook/hooks/index.tmpl | 2 +- minimal-notebook/hooks/index.tmpl | 2 +- pyspark-notebook/hooks/index.tmpl | 2 +- r-notebook/hooks/index.tmpl | 2 +- scipy-notebook/hooks/index.tmpl | 2 +- tensorflow-notebook/hooks/index.tmpl | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/all-spark-notebook/hooks/index.tmpl b/all-spark-notebook/hooks/index.tmpl index 2a9853d0e7..20c98efd72 100644 --- a/all-spark-notebook/hooks/index.tmpl +++ b/all-spark-notebook/hooks/index.tmpl @@ -1,2 +1,2 @@ -INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|${GIT_SHA_TAG}|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/base-notebook/hooks/index.tmpl b/base-notebook/hooks/index.tmpl index 2a9853d0e7..20c98efd72 100644 --- a/base-notebook/hooks/index.tmpl +++ b/base-notebook/hooks/index.tmpl @@ -1,2 +1,2 @@ -INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|${GIT_SHA_TAG}|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/datascience-notebook/hooks/index.tmpl b/datascience-notebook/hooks/index.tmpl index 2a9853d0e7..20c98efd72 100644 --- a/datascience-notebook/hooks/index.tmpl +++ b/datascience-notebook/hooks/index.tmpl @@ -1,2 +1,2 @@ -INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|${GIT_SHA_TAG}|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/minimal-notebook/hooks/index.tmpl b/minimal-notebook/hooks/index.tmpl index 2a9853d0e7..20c98efd72 100644 --- a/minimal-notebook/hooks/index.tmpl +++ b/minimal-notebook/hooks/index.tmpl @@ -1,2 +1,2 @@ -INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|${GIT_SHA_TAG}|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/pyspark-notebook/hooks/index.tmpl b/pyspark-notebook/hooks/index.tmpl index 2a9853d0e7..20c98efd72 100644 --- a/pyspark-notebook/hooks/index.tmpl +++ b/pyspark-notebook/hooks/index.tmpl @@ -1,2 +1,2 @@ -INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|${GIT_SHA_TAG}|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/r-notebook/hooks/index.tmpl b/r-notebook/hooks/index.tmpl index 2a9853d0e7..20c98efd72 100644 --- a/r-notebook/hooks/index.tmpl +++ b/r-notebook/hooks/index.tmpl @@ -1,2 +1,2 @@ -INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|${GIT_SHA_TAG}|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/scipy-notebook/hooks/index.tmpl b/scipy-notebook/hooks/index.tmpl index 2a9853d0e7..20c98efd72 100644 --- a/scipy-notebook/hooks/index.tmpl +++ b/scipy-notebook/hooks/index.tmpl @@ -1,2 +1,2 @@ -INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|${GIT_SHA_TAG}|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/tensorflow-notebook/hooks/index.tmpl b/tensorflow-notebook/hooks/index.tmpl index 2a9853d0e7..20c98efd72 100644 --- a/tensorflow-notebook/hooks/index.tmpl +++ b/tensorflow-notebook/hooks/index.tmpl @@ -1,2 +1,2 @@ -INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|${GIT_SHA_TAG}|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file From 76853d93ed3cb70cc4e220bc2fa757ce8bc62c3b Mon Sep 17 00:00:00 2001 From: Peter Parente Date: Sat, 16 Mar 2019 22:38:40 -0400 Subject: [PATCH 4/4] [ci skip] Escape those backticks --- all-spark-notebook/hooks/index.tmpl | 2 +- base-notebook/hooks/index.tmpl | 2 +- datascience-notebook/hooks/index.tmpl | 2 +- minimal-notebook/hooks/index.tmpl | 2 +- pyspark-notebook/hooks/index.tmpl | 2 +- r-notebook/hooks/index.tmpl | 2 +- scipy-notebook/hooks/index.tmpl | 2 +- tensorflow-notebook/hooks/index.tmpl | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/all-spark-notebook/hooks/index.tmpl b/all-spark-notebook/hooks/index.tmpl index 20c98efd72..fb2c60560c 100644 --- a/all-spark-notebook/hooks/index.tmpl +++ b/all-spark-notebook/hooks/index.tmpl @@ -1,2 +1,2 @@ -INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/base-notebook/hooks/index.tmpl b/base-notebook/hooks/index.tmpl index 20c98efd72..fb2c60560c 100644 --- a/base-notebook/hooks/index.tmpl +++ b/base-notebook/hooks/index.tmpl @@ -1,2 +1,2 @@ -INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/datascience-notebook/hooks/index.tmpl b/datascience-notebook/hooks/index.tmpl index 20c98efd72..fb2c60560c 100644 --- a/datascience-notebook/hooks/index.tmpl +++ b/datascience-notebook/hooks/index.tmpl @@ -1,2 +1,2 @@ -INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/minimal-notebook/hooks/index.tmpl b/minimal-notebook/hooks/index.tmpl index 20c98efd72..fb2c60560c 100644 --- a/minimal-notebook/hooks/index.tmpl +++ b/minimal-notebook/hooks/index.tmpl @@ -1,2 +1,2 @@ -INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/pyspark-notebook/hooks/index.tmpl b/pyspark-notebook/hooks/index.tmpl index 20c98efd72..fb2c60560c 100644 --- a/pyspark-notebook/hooks/index.tmpl +++ b/pyspark-notebook/hooks/index.tmpl @@ -1,2 +1,2 @@ -INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/r-notebook/hooks/index.tmpl b/r-notebook/hooks/index.tmpl index 20c98efd72..fb2c60560c 100644 --- a/r-notebook/hooks/index.tmpl +++ b/r-notebook/hooks/index.tmpl @@ -1,2 +1,2 @@ -INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/scipy-notebook/hooks/index.tmpl b/scipy-notebook/hooks/index.tmpl index 20c98efd72..fb2c60560c 100644 --- a/scipy-notebook/hooks/index.tmpl +++ b/scipy-notebook/hooks/index.tmpl @@ -1,2 +1,2 @@ -INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file diff --git a/tensorflow-notebook/hooks/index.tmpl b/tensorflow-notebook/hooks/index.tmpl index 20c98efd72..fb2c60560c 100644 --- a/tensorflow-notebook/hooks/index.tmpl +++ b/tensorflow-notebook/hooks/index.tmpl @@ -1,2 +1,2 @@ -INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" +INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE" \ No newline at end of file