You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by dg...@apache.org on 2019/06/29 22:42:38 UTC

[incubator-openwhisk-package-alarms] branch master updated (6aaed48 -> 21ff8af)

This is an automated email from the ASF dual-hosted git repository.

dgrove pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-package-alarms.git.


    from 6aaed48  update gradle and scala versions (#191)
     new d5db5ea  change travis builds to publish docker images with tag 'nightly'
     new 21ff8af  add license header to Dockerfile

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis.yml            |  4 ++--
 Dockerfile             | 17 +++++++++++++++++
 tools/travis/deploy.sh |  4 ++--
 3 files changed, 21 insertions(+), 4 deletions(-)


[incubator-openwhisk-package-alarms] 02/02: add license header to Dockerfile

Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-package-alarms.git

commit 21ff8afae825371b684229fc80ce652ca0ba7484
Author: David Grove <gr...@us.ibm.com>
AuthorDate: Sat Jun 29 18:06:13 2019 -0400

    add license header to Dockerfile
---
 Dockerfile | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index ec07e4d..c04d554 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 node:10.15.3
 
 # only package.json


[incubator-openwhisk-package-alarms] 01/02: change travis builds to publish docker images with tag 'nightly'

Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-package-alarms.git

commit d5db5eab8266396c82534a30dd3efadea2c7919d
Author: David Grove <gr...@us.ibm.com>
AuthorDate: Fri Jun 28 12:44:51 2019 -0400

    change travis builds to publish docker images with tag 'nightly'
---
 .travis.yml            | 4 ++--
 tools/travis/deploy.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aeb9b91..fc17d9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,9 +43,9 @@ script:
   - ./tools/travis/build.sh
 
 deploy:
-  # deploy latest
+  # deploy nightly
   - provider: script
-    script: ./tools/travis/deploy.sh openwhisk alarmprovider latest
+    script: ./tools/travis/deploy.sh openwhisk alarmprovider nightly
     on:
       branch: master
   # deploy tag
diff --git a/tools/travis/deploy.sh b/tools/travis/deploy.sh
index 9f1389d..b95f85e 100755
--- a/tools/travis/deploy.sh
+++ b/tools/travis/deploy.sh
@@ -31,8 +31,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}"