Merge pull request #829 from parente/image-manifests

[ci skip] Improve manifests, update index page

all-spark-notebook/hooks/index.tmpl

@@ -0,0 +1,2 @@
+INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})<br />[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)<br />[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|"
+sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE"

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})
@@ -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
 
 \`\`\`

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"

base-notebook/hooks/index.tmpl

@@ -0,0 +1,2 @@
+INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})<br />[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)<br />[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|"
+sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE"

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})
@@ -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)
 \`\`\`

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"

datascience-notebook/hooks/index.tmpl

@@ -0,0 +1,2 @@
+INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})<br />[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)<br />[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|"
+sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE"

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})
@@ -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)]')
 \`\`\`

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"

minimal-notebook/hooks/index.tmpl

@@ -0,0 +1,2 @@
+INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})<br />[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)<br />[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|"
+sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE"

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})
@@ -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)
 \`\`\`

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"

pyspark-notebook/hooks/index.tmpl

@@ -0,0 +1,2 @@
+INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})<br />[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)<br />[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|"
+sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE"

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})
@@ -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)
 \`\`\`

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"

r-notebook/hooks/index.tmpl

@@ -0,0 +1,2 @@
+INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})<br />[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)<br />[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|"
+sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE"

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})
@@ -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)
 \`\`\`

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"

scipy-notebook/hooks/index.tmpl

@@ -0,0 +1,2 @@
+INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${SOURCE_COMMIT})<br />[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${SOURCE_COMMIT}/${IMAGE_SHORT_NAME}/Dockerfile)<br />[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|"
+sed "/|-|/a ${INDEX_ROW}" -i "$INDEX_FILE"

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})
@@ -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)
 \`\`\`