diff --git a/all-spark-notebook/hooks/run_hook b/all-spark-notebook/hooks/run_hook index cbfc0d6a..8073d1e1 100755 --- a/all-spark-notebook/hooks/run_hook +++ b/all-spark-notebook/hooks/run_hook @@ -1,9 +1,7 @@ #!/bin/bash set -e -# Apply tags GIT_SHA_TAG=${GITHUB_SHA:0:12} -docker tag $IMAGE_NAME "$DOCKER_REPO:$GIT_SHA_TAG" # Update index INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${GITHUB_SHA})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${GITHUB_SHA}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" diff --git a/base-notebook/hooks/run_hook b/base-notebook/hooks/run_hook index df571821..0e337694 100755 --- a/base-notebook/hooks/run_hook +++ b/base-notebook/hooks/run_hook @@ -1,17 +1,11 @@ #!/bin/bash set -e -# Apply tags GIT_SHA_TAG=${GITHUB_SHA:0:12} -docker tag $IMAGE_NAME "$DOCKER_REPO:$GIT_SHA_TAG" PY_VERSION_TAG="python-$(docker run --rm ${IMAGE_NAME} python --version 2>&1 | awk '{print $2}')" -docker tag $IMAGE_NAME "$DOCKER_REPO:$PY_VERSION_TAG" NB_VERSION_TAG="notebook-$(docker run --rm -a STDOUT ${IMAGE_NAME} jupyter-notebook --version | tr -d '\r')" -docker tag $IMAGE_NAME "$DOCKER_REPO:${NB_VERSION_TAG%% }" LAB_VERSION_TAG="lab-$(docker run --rm -a STDOUT ${IMAGE_NAME} jupyter-lab --version | tr -d '\r')" -docker tag $IMAGE_NAME "$DOCKER_REPO:${LAB_VERSION_TAG%%\r}" HUB_VERSION_TAG="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} jupyterhub --version | tr -d '\r')" -docker tag $IMAGE_NAME "$DOCKER_REPO:${HUB_VERSION_TAG%%\r}" # Update index INDEX_FILE="${WIKI_PATH}/Home.md" diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile index 3daa993d..2c34020b 100644 --- a/datascience-notebook/Dockerfile +++ b/datascience-notebook/Dockerfile @@ -62,10 +62,10 @@ RUN conda install --quiet --yes \ 'r-caret=6.0*' \ 'r-crayon=1.4*' \ 'r-devtools=2.3*' \ - 'r-forecast=8.14*' \ + 'r-forecast=8.14*' \ 'r-hexbin=1.28*' \ 'r-htmltools=0.5*' \ - 'r-htmlwidgets=1.5*' \ + 'r-htmlwidgets=1.5*' \ 'r-irkernel=1.1*' \ 'r-nycflights13=1.0*' \ 'r-randomforest=4.6*' \ diff --git a/datascience-notebook/hooks/run_hook b/datascience-notebook/hooks/run_hook index 9a68d7d5..f0c53f93 100755 --- a/datascience-notebook/hooks/run_hook +++ b/datascience-notebook/hooks/run_hook @@ -1,21 +1,13 @@ #!/bin/bash set -e -# Apply tags GIT_SHA_TAG=${GITHUB_SHA:0:12} -docker tag $IMAGE_NAME "$DOCKER_REPO:$GIT_SHA_TAG" PY_VERSION_TAG="python-$(docker run --rm ${IMAGE_NAME} python --version 2>&1 | awk '{print $2}')" -docker tag $IMAGE_NAME "$DOCKER_REPO:$PY_VERSION_TAG" R_VERSION_TAG="r-$(docker run --rm -a STDOUT ${IMAGE_NAME} R --version | sed -n 1p | awk '{print $3}')" -docker tag $IMAGE_NAME "$DOCKER_REPO:${R_VERSION_TAG%%\r}" JULIA_VERSION_TAG="julia-$(docker run --rm -a STDOUT ${IMAGE_NAME} julia --version | awk '{print $3}')" -docker tag $IMAGE_NAME "$DOCKER_REPO:${JULIA_VERSION_TAG%%\r}" NB_VERSION_TAG="notebook-$(docker run --rm -a STDOUT ${IMAGE_NAME} jupyter-notebook --version | tr -d '\r')" -docker tag $IMAGE_NAME "$DOCKER_REPO:${NB_VERSION_TAG%% }" LAB_VERSION_TAG="lab-$(docker run --rm -a STDOUT ${IMAGE_NAME} jupyter-lab --version | tr -d '\r')" -docker tag $IMAGE_NAME "$DOCKER_REPO:${LAB_VERSION_TAG%%\r}" HUB_VERSION_TAG="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} jupyterhub --version | tr -d '\r')" -docker tag $IMAGE_NAME "$DOCKER_REPO:${HUB_VERSION_TAG%%\r}" # Update index diff --git a/minimal-notebook/hooks/run_hook b/minimal-notebook/hooks/run_hook index 69c21756..f4407c15 100755 --- a/minimal-notebook/hooks/run_hook +++ b/minimal-notebook/hooks/run_hook @@ -1,9 +1,7 @@ #!/bin/bash set -e -# Apply tags GIT_SHA_TAG=${GITHUB_SHA:0:12} -docker tag $IMAGE_NAME "$DOCKER_REPO:$GIT_SHA_TAG" # Update index INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${GITHUB_SHA})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${GITHUB_SHA}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" diff --git a/pyspark-notebook/hooks/run_hook b/pyspark-notebook/hooks/run_hook index d4c65521..0fafbc09 100755 --- a/pyspark-notebook/hooks/run_hook +++ b/pyspark-notebook/hooks/run_hook @@ -1,9 +1,7 @@ #!/bin/bash set -e -# Apply tags GIT_SHA_TAG=${GITHUB_SHA:0:12} -docker tag $IMAGE_NAME "$DOCKER_REPO:$GIT_SHA_TAG" # Update index INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${GITHUB_SHA})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${GITHUB_SHA}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" diff --git a/r-notebook/hooks/run_hook b/r-notebook/hooks/run_hook index 2add2162..6170d929 100755 --- a/r-notebook/hooks/run_hook +++ b/r-notebook/hooks/run_hook @@ -1,9 +1,7 @@ #!/bin/bash set -e -# Apply tags GIT_SHA_TAG=${GITHUB_SHA:0:12} -docker tag $IMAGE_NAME "$DOCKER_REPO:$GIT_SHA_TAG" # Update index INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${GITHUB_SHA})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${GITHUB_SHA}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" diff --git a/scipy-notebook/hooks/run_hook b/scipy-notebook/hooks/run_hook index 783ffa92..f4407c15 100755 --- a/scipy-notebook/hooks/run_hook +++ b/scipy-notebook/hooks/run_hook @@ -1,9 +1,7 @@ #!/bin/bash set -e -# Apply tags GIT_SHA_TAG=${GITHUB_SHA:0:12} -docker tag $IMAGE_NAME "$DOCKER_REPO:$GIT_SHA_TAG" # Update index INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${GITHUB_SHA})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${GITHUB_SHA}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|" @@ -42,4 +40,4 @@ $(docker run --rm ${IMAGE_NAME} conda list) \`\`\` $(docker run --rm ${IMAGE_NAME} apt list --installed) \`\`\` -EOF \ No newline at end of file +EOF diff --git a/tensorflow-notebook/hooks/run_hook b/tensorflow-notebook/hooks/run_hook index 69c21756..f4407c15 100755 --- a/tensorflow-notebook/hooks/run_hook +++ b/tensorflow-notebook/hooks/run_hook @@ -1,9 +1,7 @@ #!/bin/bash set -e -# Apply tags GIT_SHA_TAG=${GITHUB_SHA:0:12} -docker tag $IMAGE_NAME "$DOCKER_REPO:$GIT_SHA_TAG" # Update index INDEX_ROW="|\`${BUILD_TIMESTAMP}\`|\`jupyter/${IMAGE_SHORT_NAME}:${GIT_SHA_TAG}\`|[Git diff](https://github.com/jupyter/docker-stacks/commit/${GITHUB_SHA})
[Dockerfile](https://github.com/jupyter/docker-stacks/blob/${GITHUB_SHA}/${IMAGE_SHORT_NAME}/Dockerfile)
[Build manifest](./${IMAGE_SHORT_NAME}-${GIT_SHA_TAG})|"