jasonpet closed pull request #59: update base alpine image URL: https://github.com/apache/incubator-openwhisk-runtime-docker/pull/59
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md index 17952ec..321a1f9 100644 --- a/core/CHANGELOG.md +++ b/core/CHANGELOG.md @@ -19,7 +19,11 @@ # Apache OpenWhisk Docker Runtime Container -## 1.3.3 +## Apache 1.13.0 (next release) +Changes: + - Update base python image to `python:3.6-alpine` + +## 1.3.3 (Apache 1.12.0) Changes: - Update run handler to accept more environment variables [#55](https://github.com/apache/incubator-openwhisk-runtime-docker/pull/55) diff --git a/core/actionProxy/Dockerfile b/core/actionProxy/Dockerfile index b799df6..7045f44 100644 --- a/core/actionProxy/Dockerfile +++ b/core/actionProxy/Dockerfile @@ -16,7 +16,7 @@ # # Dockerfile for docker skeleton (useful for running blackbox binaries, scripts, or Python 3 actions) . -FROM python:3.6.1-alpine +FROM python:3.6-alpine # Upgrade and install basic Python dependencies. RUN apk upgrade --update \ diff --git a/tools/travis/publish.sh b/tools/travis/publish.sh index 9deb4cd..23bae25 100755 --- a/tools/travis/publish.sh +++ b/tools/travis/publish.sh @@ -47,6 +47,15 @@ if [[ ! -z ${GRADLE_BUILD} ]] && [[ ! -z ${IMAGE_PREFIX} ]] && [[ ! -z ${IMAGE_T -PdockerRegistry=docker.io \ -PdockerImagePrefix=${IMAGE_PREFIX} \ -PdockerImageTag=${IMAGE_TAG} -fi + # if doing latest also push a tag with the hash commit + if [ ${IMAGE_TAG} == "latest" ]; then + SHORT_COMMIT=`git rev-parse --short HEAD` + TERM=dumb ./gradlew \ + ${GRADLE_BUILD} \ + -PdockerRegistry=docker.io \ + -PdockerImagePrefix=${IMAGE_PREFIX} \ + -PdockerImageTag=${SHORT_COMMIT} + fi +fi ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
