jasonpet closed pull request #40: update to use latest alpine
URL: https://github.com/apache/incubator-openwhisk-runtime-python/pull/40
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/python2Action/Dockerfile b/core/python2Action/Dockerfile
index 7328540..d22fabe 100644
--- a/core/python2Action/Dockerfile
+++ b/core/python2Action/Dockerfile
@@ -16,7 +16,7 @@
#
# Dockerfile for Python 2 actions, similar to the Python 3-based
core/pythonAction
-FROM python:2.7.12-alpine
+FROM python:2.7-alpine
# Upgrade and install basic Python dependencies
RUN apk add --no-cache \
diff --git a/core/pythonAction/Dockerfile b/core/pythonAction/Dockerfile
index 1e01660..4ffe48a 100644
--- a/core/pythonAction/Dockerfile
+++ b/core/pythonAction/Dockerfile
@@ -16,7 +16,7 @@
#
# Dockerfile for python actions, overrides and extends ActionRunner from
actionProxy
-FROM openwhisk/dockerskeleton:1.3.3
+FROM openwhisk/dockerskeleton:latest
RUN apk add --no-cache \
bzip2-dev \
diff --git a/tools/travis/publish.sh b/tools/travis/publish.sh
index 4ff9ec3..933cf72 100755
--- a/tools/travis/publish.sh
+++ b/tools/travis/publish.sh
@@ -46,4 +46,15 @@ TERM=dumb ./gradlew \
-PdockerRegistry=docker.io \
-PdockerImagePrefix=${IMAGE_PREFIX} \
-PdockerImageTag=${IMAGE_TAG}
+
+ # 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 \
+ :core:${RUNTIME}:distDocker \
+ -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
