Commit a3301371 authored by Peter Parente's avatar Peter Parente Committed by GitHub

Merge pull request #829 from parente/image-manifests

[ci skip] Improve manifests, update index page
parents eb149a8c 76853d93
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"
\ No newline at end of file
cat << EOF > "$MANIFEST_FILE" cat << EOF > "$MANIFEST_FILE"
* Build datetime: $(date -u +%FT%TZ) * 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}
* 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})
...@@ -8,18 +8,36 @@ cat << EOF > "$MANIFEST_FILE" ...@@ -8,18 +8,36 @@ cat << EOF > "$MANIFEST_FILE"
${COMMIT_MSG} ${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 ## Python Packages
\`\`\`
$(docker run --rm ${IMAGE_NAME} python --version)
\`\`\`
\`\`\`
$(docker run --rm ${IMAGE_NAME} conda info)
\`\`\`
\`\`\` \`\`\`
$(docker run --rm ${IMAGE_NAME} conda list) $(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 ## Apt Packages
\`\`\` \`\`\`
......
...@@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG ...@@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG
docker push $DOCKER_REPO:$GIT_SHA_TAG docker push $DOCKER_REPO:$GIT_SHA_TAG
# Create a working directory. # Create a working directory.
BUILD_TIMESTAMP=$(date -u +%FT%TZ)
WORKDIR=$(mktemp -d) WORKDIR=$(mktemp -d)
GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git" GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git"
GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki" GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki"
IMAGE_SHORT_NAME=$(basename $DOCKER_REPO) 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. # Configure git so it can push back to GitHub.
eval $(ssh-agent -s) eval $(ssh-agent -s)
...@@ -29,6 +31,7 @@ popd ...@@ -29,6 +31,7 @@ popd
# Render the build manifest template. # Render the build manifest template.
mkdir -p $(dirname "$MANIFEST_FILE") mkdir -p $(dirname "$MANIFEST_FILE")
source hooks/manifest.tmpl source hooks/manifest.tmpl
source hooks/index.tmpl
# Push the wiki update back to GitHub. # Push the wiki update back to GitHub.
pushd "$GIT_SANDBOX" pushd "$GIT_SANDBOX"
......
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"
\ No newline at end of file
cat << EOF > "$MANIFEST_FILE" cat << EOF > "$MANIFEST_FILE"
* Build datetime: $(date -u +%FT%TZ) * 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}
* 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})
...@@ -10,6 +10,14 @@ ${COMMIT_MSG} ...@@ -10,6 +10,14 @@ ${COMMIT_MSG}
## Python Packages ## Python Packages
\`\`\`
$(docker run --rm ${IMAGE_NAME} python --version)
\`\`\`
\`\`\`
$(docker run --rm ${IMAGE_NAME} conda info)
\`\`\`
\`\`\` \`\`\`
$(docker run --rm ${IMAGE_NAME} conda list) $(docker run --rm ${IMAGE_NAME} conda list)
\`\`\` \`\`\`
......
...@@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG ...@@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG
docker push $DOCKER_REPO:$GIT_SHA_TAG docker push $DOCKER_REPO:$GIT_SHA_TAG
# Create a working directory. # Create a working directory.
BUILD_TIMESTAMP=$(date -u +%FT%TZ)
WORKDIR=$(mktemp -d) WORKDIR=$(mktemp -d)
GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git" GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git"
GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki" GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki"
IMAGE_SHORT_NAME=$(basename $DOCKER_REPO) 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. # Configure git so it can push back to GitHub.
eval $(ssh-agent -s) eval $(ssh-agent -s)
...@@ -29,6 +31,7 @@ popd ...@@ -29,6 +31,7 @@ popd
# Render the build manifest template. # Render the build manifest template.
mkdir -p $(dirname "$MANIFEST_FILE") mkdir -p $(dirname "$MANIFEST_FILE")
source hooks/manifest.tmpl source hooks/manifest.tmpl
source hooks/index.tmpl
# Push the wiki update back to GitHub. # Push the wiki update back to GitHub.
pushd "$GIT_SANDBOX" pushd "$GIT_SANDBOX"
......
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"
\ No newline at end of file
cat << EOF > "$MANIFEST_FILE" cat << EOF > "$MANIFEST_FILE"
* Build datetime: $(date -u +%FT%TZ) * 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}
* 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})
...@@ -10,18 +10,34 @@ ${COMMIT_MSG} ...@@ -10,18 +10,34 @@ ${COMMIT_MSG}
## Julia Packages ## Julia Packages
\`\`\`
$(docker run --rm ${IMAGE_NAME} julia -E 'using InteractiveUtils; versioninfo()')
\`\`\`
\`\`\` \`\`\`
$(docker run --rm ${IMAGE_NAME} julia -E 'import Pkg; Pkg.status()') $(docker run --rm ${IMAGE_NAME} julia -E 'import Pkg; Pkg.status()')
\`\`\` \`\`\`
## Python Packages ## Python Packages
\`\`\`
$(docker run --rm ${IMAGE_NAME} python --version)
\`\`\`
\`\`\`
$(docker run --rm ${IMAGE_NAME} conda info)
\`\`\`
\`\`\` \`\`\`
$(docker run --rm ${IMAGE_NAME} conda list) $(docker run --rm ${IMAGE_NAME} conda list)
\`\`\` \`\`\`
## R Packages ## R Packages
\`\`\`
$(docker run --rm ${IMAGE_NAME} R --version)
\`\`\`
\`\`\` \`\`\`
$(docker run --rm ${IMAGE_NAME} R --silent -e 'installed.packages(.Library)[, c(1,3)]') $(docker run --rm ${IMAGE_NAME} R --silent -e 'installed.packages(.Library)[, c(1,3)]')
\`\`\` \`\`\`
......
...@@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG ...@@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG
docker push $DOCKER_REPO:$GIT_SHA_TAG docker push $DOCKER_REPO:$GIT_SHA_TAG
# Create a working directory. # Create a working directory.
BUILD_TIMESTAMP=$(date -u +%FT%TZ)
WORKDIR=$(mktemp -d) WORKDIR=$(mktemp -d)
GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git" GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git"
GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki" GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki"
IMAGE_SHORT_NAME=$(basename $DOCKER_REPO) 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. # Configure git so it can push back to GitHub.
eval $(ssh-agent -s) eval $(ssh-agent -s)
...@@ -29,6 +31,7 @@ popd ...@@ -29,6 +31,7 @@ popd
# Render the build manifest template. # Render the build manifest template.
mkdir -p $(dirname "$MANIFEST_FILE") mkdir -p $(dirname "$MANIFEST_FILE")
source hooks/manifest.tmpl source hooks/manifest.tmpl
source hooks/index.tmpl
# Push the wiki update back to GitHub. # Push the wiki update back to GitHub.
pushd "$GIT_SANDBOX" pushd "$GIT_SANDBOX"
......
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"
\ No newline at end of file
cat << EOF > "$MANIFEST_FILE" cat << EOF > "$MANIFEST_FILE"
* Build datetime: $(date -u +%FT%TZ) * 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}
* 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})
...@@ -10,6 +10,14 @@ ${COMMIT_MSG} ...@@ -10,6 +10,14 @@ ${COMMIT_MSG}
## Python Packages ## Python Packages
\`\`\`
$(docker run --rm ${IMAGE_NAME} python --version)
\`\`\`
\`\`\`
$(docker run --rm ${IMAGE_NAME} conda info)
\`\`\`
\`\`\` \`\`\`
$(docker run --rm ${IMAGE_NAME} conda list) $(docker run --rm ${IMAGE_NAME} conda list)
\`\`\` \`\`\`
......
...@@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG ...@@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG
docker push $DOCKER_REPO:$GIT_SHA_TAG docker push $DOCKER_REPO:$GIT_SHA_TAG
# Create a working directory. # Create a working directory.
BUILD_TIMESTAMP=$(date -u +%FT%TZ)
WORKDIR=$(mktemp -d) WORKDIR=$(mktemp -d)
GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git" GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git"
GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki" GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki"
IMAGE_SHORT_NAME=$(basename $DOCKER_REPO) 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. # Configure git so it can push back to GitHub.
eval $(ssh-agent -s) eval $(ssh-agent -s)
...@@ -29,6 +31,7 @@ popd ...@@ -29,6 +31,7 @@ popd
# Render the build manifest template. # Render the build manifest template.
mkdir -p $(dirname "$MANIFEST_FILE") mkdir -p $(dirname "$MANIFEST_FILE")
source hooks/manifest.tmpl source hooks/manifest.tmpl
source hooks/index.tmpl
# Push the wiki update back to GitHub. # Push the wiki update back to GitHub.
pushd "$GIT_SANDBOX" pushd "$GIT_SANDBOX"
......
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"
\ No newline at end of file
cat << EOF > "$MANIFEST_FILE" cat << EOF > "$MANIFEST_FILE"
* Build datetime: $(date -u +%FT%TZ) * 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}
* 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})
...@@ -8,14 +8,22 @@ cat << EOF > "$MANIFEST_FILE" ...@@ -8,14 +8,22 @@ cat << EOF > "$MANIFEST_FILE"
${COMMIT_MSG} ${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 ## Python Packages
\`\`\`
$(docker run --rm ${IMAGE_NAME} python --version)
\`\`\`
\`\`\`
$(docker run --rm ${IMAGE_NAME} conda info)
\`\`\`
\`\`\` \`\`\`
$(docker run --rm ${IMAGE_NAME} conda list) $(docker run --rm ${IMAGE_NAME} conda list)
\`\`\` \`\`\`
......
...@@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG ...@@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG
docker push $DOCKER_REPO:$GIT_SHA_TAG docker push $DOCKER_REPO:$GIT_SHA_TAG
# Create a working directory. # Create a working directory.
BUILD_TIMESTAMP=$(date -u +%FT%TZ)
WORKDIR=$(mktemp -d) WORKDIR=$(mktemp -d)
GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git" GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git"
GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki" GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki"
IMAGE_SHORT_NAME=$(basename $DOCKER_REPO) 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. # Configure git so it can push back to GitHub.
eval $(ssh-agent -s) eval $(ssh-agent -s)
...@@ -29,6 +31,7 @@ popd ...@@ -29,6 +31,7 @@ popd
# Render the build manifest template. # Render the build manifest template.
mkdir -p $(dirname "$MANIFEST_FILE") mkdir -p $(dirname "$MANIFEST_FILE")
source hooks/manifest.tmpl source hooks/manifest.tmpl
source hooks/index.tmpl
# Push the wiki update back to GitHub. # Push the wiki update back to GitHub.
pushd "$GIT_SANDBOX" pushd "$GIT_SANDBOX"
......
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"
\ No newline at end of file
cat << EOF > "$MANIFEST_FILE" cat << EOF > "$MANIFEST_FILE"
* Build datetime: $(date -u +%FT%TZ) * 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}
* 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})
...@@ -10,12 +10,24 @@ ${COMMIT_MSG} ...@@ -10,12 +10,24 @@ ${COMMIT_MSG}
## R Packages ## R Packages
\`\`\`
$(docker run --rm ${IMAGE_NAME} R --version)
\`\`\`
\`\`\` \`\`\`
$(docker run --rm ${IMAGE_NAME} R --silent -e 'installed.packages(.Library)[, c(1,3)]') $(docker run --rm ${IMAGE_NAME} R --silent -e 'installed.packages(.Library)[, c(1,3)]')
\`\`\` \`\`\`
## Python Packages ## Python Packages
\`\`\`
$(docker run --rm ${IMAGE_NAME} python --version)
\`\`\`
\`\`\`
$(docker run --rm ${IMAGE_NAME} conda info)
\`\`\`
\`\`\` \`\`\`
$(docker run --rm ${IMAGE_NAME} conda list) $(docker run --rm ${IMAGE_NAME} conda list)
\`\`\` \`\`\`
......
...@@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG ...@@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG
docker push $DOCKER_REPO:$GIT_SHA_TAG docker push $DOCKER_REPO:$GIT_SHA_TAG
# Create a working directory. # Create a working directory.
BUILD_TIMESTAMP=$(date -u +%FT%TZ)
WORKDIR=$(mktemp -d) WORKDIR=$(mktemp -d)
GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git" GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git"
GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki" GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki"
IMAGE_SHORT_NAME=$(basename $DOCKER_REPO) 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. # Configure git so it can push back to GitHub.
eval $(ssh-agent -s) eval $(ssh-agent -s)
...@@ -29,6 +31,7 @@ popd ...@@ -29,6 +31,7 @@ popd
# Render the build manifest template. # Render the build manifest template.
mkdir -p $(dirname "$MANIFEST_FILE") mkdir -p $(dirname "$MANIFEST_FILE")
source hooks/manifest.tmpl source hooks/manifest.tmpl
source hooks/index.tmpl
# Push the wiki update back to GitHub. # Push the wiki update back to GitHub.
pushd "$GIT_SANDBOX" pushd "$GIT_SANDBOX"
......
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"
\ No newline at end of file
cat << EOF > "$MANIFEST_FILE" cat << EOF > "$MANIFEST_FILE"
* Build datetime: $(date -u +%FT%TZ) * 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}
* 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})
...@@ -10,6 +10,14 @@ ${COMMIT_MSG} ...@@ -10,6 +10,14 @@ ${COMMIT_MSG}
## Python Packages ## Python Packages
\`\`\`
$(docker run --rm ${IMAGE_NAME} python --version)
\`\`\`
\`\`\`
$(docker run --rm ${IMAGE_NAME} conda info)
\`\`\`
\`\`\` \`\`\`
$(docker run --rm ${IMAGE_NAME} conda list) $(docker run --rm ${IMAGE_NAME} conda list)
\`\`\` \`\`\`
......
...@@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG ...@@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG
docker push $DOCKER_REPO:$GIT_SHA_TAG docker push $DOCKER_REPO:$GIT_SHA_TAG
# Create a working directory. # Create a working directory.
BUILD_TIMESTAMP=$(date -u +%FT%TZ)
WORKDIR=$(mktemp -d) WORKDIR=$(mktemp -d)
GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git" GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git"
GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki" GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki"
IMAGE_SHORT_NAME=$(basename $DOCKER_REPO) 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. # Configure git so it can push back to GitHub.
eval $(ssh-agent -s) eval $(ssh-agent -s)
...@@ -29,6 +31,7 @@ popd ...@@ -29,6 +31,7 @@ popd
# Render the build manifest template. # Render the build manifest template.
mkdir -p $(dirname "$MANIFEST_FILE") mkdir -p $(dirname "$MANIFEST_FILE")
source hooks/manifest.tmpl source hooks/manifest.tmpl
source hooks/index.tmpl
# Push the wiki update back to GitHub. # Push the wiki update back to GitHub.
pushd "$GIT_SANDBOX" pushd "$GIT_SANDBOX"
......
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"
\ No newline at end of file
cat << EOF > "$MANIFEST_FILE" cat << EOF > "$MANIFEST_FILE"
* Build datetime: $(date -u +%FT%TZ) * 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}
* 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})
...@@ -10,6 +10,14 @@ ${COMMIT_MSG} ...@@ -10,6 +10,14 @@ ${COMMIT_MSG}
## Python Packages ## Python Packages
\`\`\`
$(docker run --rm ${IMAGE_NAME} python --version)
\`\`\`
\`\`\`
$(docker run --rm ${IMAGE_NAME} conda info)
\`\`\`
\`\`\` \`\`\`
$(docker run --rm ${IMAGE_NAME} conda list) $(docker run --rm ${IMAGE_NAME} conda list)
\`\`\` \`\`\`
......
...@@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG ...@@ -8,11 +8,13 @@ docker tag $IMAGE_NAME $DOCKER_REPO:$GIT_SHA_TAG
docker push $DOCKER_REPO:$GIT_SHA_TAG docker push $DOCKER_REPO:$GIT_SHA_TAG
# Create a working directory. # Create a working directory.
BUILD_TIMESTAMP=$(date -u +%FT%TZ)
WORKDIR=$(mktemp -d) WORKDIR=$(mktemp -d)
GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git" GIT_URI="git@github.com:jupyter/docker-stacks.wiki.git"
GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki" GIT_SANDBOX="${WORKDIR}/docker-stacks.wiki"
IMAGE_SHORT_NAME=$(basename $DOCKER_REPO) 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. # Configure git so it can push back to GitHub.
eval $(ssh-agent -s) eval $(ssh-agent -s)
...@@ -29,6 +31,7 @@ popd ...@@ -29,6 +31,7 @@ popd
# Render the build manifest template. # Render the build manifest template.
mkdir -p $(dirname "$MANIFEST_FILE") mkdir -p $(dirname "$MANIFEST_FILE")
source hooks/manifest.tmpl source hooks/manifest.tmpl
source hooks/index.tmpl
# Push the wiki update back to GitHub. # Push the wiki update back to GitHub.
pushd "$GIT_SANDBOX" pushd "$GIT_SANDBOX"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment