You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ra...@apache.org on 2019/06/29 22:19:49 UTC
[incubator-openwhisk-package-kafka] branch master updated: change
travis builds to publish docker images with tag 'nightly' (#345)
This is an automated email from the ASF dual-hosted git repository.
rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-package-kafka.git
The following commit(s) were added to refs/heads/master by this push:
new 2f8f134 change travis builds to publish docker images with tag 'nightly' (#345)
2f8f134 is described below
commit 2f8f13479bfe2260f961469296f3f492e7737c23
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Sat Jun 29 18:19:45 2019 -0400
change travis builds to publish docker images with tag 'nightly' (#345)
* change travis builds to publish docker images with tag 'nightly'
* add license header to Dockerfile
---
.travis.yml | 4 ++--
Dockerfile | 17 +++++++++++++++++
tools/travis/deploy.sh | 4 ++--
3 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 58fa2d2..3beb656 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,9 +42,9 @@ script:
- ./tools/travis/build.sh
deploy:
- # deploy latest
+ # deploy nightly
- provider: script
- script: ./tools/travis/deploy.sh openwhisk kafkaprovider latest
+ script: ./tools/travis/deploy.sh openwhisk kafkaprovider nightly
on:
branch: master
# deploy tag
diff --git a/Dockerfile b/Dockerfile
index 7df860c..2e45c8d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
FROM python:2.7.16
RUN apt-get update && apt-get upgrade -y
diff --git a/tools/travis/deploy.sh b/tools/travis/deploy.sh
index c4f0eb4..39b771a 100755
--- a/tools/travis/deploy.sh
+++ b/tools/travis/deploy.sh
@@ -18,8 +18,8 @@ docker build . --tag ${dockerhub_image}
echo docker push ${dockerhub_image}
docker push ${dockerhub_image}
-# if image tag is latest, also push a tag with the hash commit
-if [ ${dockerhub_image_tag} == "latest" ]; then
+# if image tag is nightly, also push a tag with the hash commit
+if [ ${dockerhub_image_tag} == "nightly" ]; then
short_commit=`git rev-parse --short HEAD`
dockerhub_githash_image="${dockerhub_image_prefix}/${dockerhub_image_name}:${short_commit}"