Skip to content

Commit 2de1d29

Browse files
author
Jason Peterson
authored
Merge pull request #59 from csantanapr/latest_alpine381
update base alpine image
2 parents 247baf5 + ab225bc commit 2de1d29

3 files changed

Lines changed: 16 additions & 3 deletions

File tree

core/CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919

2020
# Apache OpenWhisk Docker Runtime Container
2121

22-
## 1.3.3
22+
## Apache 1.13.0 (next release)
23+
Changes:
24+
- Update base python image to `python:3.6-alpine`
25+
26+
## 1.3.3 (Apache 1.12.0)
2327
Changes:
2428
- Update run handler to accept more environment variables [#55](https://github.com/apache/incubator-openwhisk-runtime-docker/pull/55)
2529

core/actionProxy/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717

1818
# Dockerfile for docker skeleton (useful for running blackbox binaries, scripts, or Python 3 actions) .
19-
FROM python:3.6.1-alpine
19+
FROM python:3.6-alpine
2020

2121
# Upgrade and install basic Python dependencies.
2222
RUN apk upgrade --update \

tools/travis/publish.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,15 @@ if [[ ! -z ${GRADLE_BUILD} ]] && [[ ! -z ${IMAGE_PREFIX} ]] && [[ ! -z ${IMAGE_T
4747
-PdockerRegistry=docker.io \
4848
-PdockerImagePrefix=${IMAGE_PREFIX} \
4949
-PdockerImageTag=${IMAGE_TAG}
50-
fi
5150

51+
# if doing latest also push a tag with the hash commit
52+
if [ ${IMAGE_TAG} == "latest" ]; then
53+
SHORT_COMMIT=`git rev-parse --short HEAD`
54+
TERM=dumb ./gradlew \
55+
${GRADLE_BUILD} \
56+
-PdockerRegistry=docker.io \
57+
-PdockerImagePrefix=${IMAGE_PREFIX} \
58+
-PdockerImageTag=${SHORT_COMMIT}
59+
fi
5260

61+
fi

0 commit comments

Comments
 (0)