You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ho...@apache.org on 2018/05/30 15:12:18 UTC
[incubator-openwhisk-runtime-php] branch master updated: Fix bad
Dockerfile license and use ASF release config. (#24)
This is an automated email from the ASF dual-hosted git repository.
houshengbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-php.git
The following commit(s) were added to refs/heads/master by this push:
new c2e63eb Fix bad Dockerfile license and use ASF release config. (#24)
c2e63eb is described below
commit c2e63ebd67346c60716d96abd5ec10468ba4bee8
Author: Matt Rutkowski <mr...@us.ibm.com>
AuthorDate: Wed May 30 10:12:14 2018 -0500
Fix bad Dockerfile license and use ASF release config. (#24)
---
core/php7.1Action/Dockerfile | 23 ++++++++++++-----------
tools/travis/build.sh | 2 +-
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/core/php7.1Action/Dockerfile b/core/php7.1Action/Dockerfile
index 20eea35..dc6661f 100644
--- a/core/php7.1Action/Dockerfile
+++ b/core/php7.1Action/Dockerfile
@@ -1,17 +1,18 @@
#
-# 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:
+# 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
+# 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.
+# 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 php:7.1-alpine
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index 5b8d1fd..40d6d7a 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -31,7 +31,7 @@ IMAGE_PREFIX="testing"
# run scancode using the ASF Release configuration
cd $UTILDIR
-scancode/scanCode.py --config scancode/ASF-Release-v2.cfg $ROOTDIR
+scancode/scanCode.py --config scancode/ASF-Release.cfg $ROOTDIR
# Build OpenWhisk
cd $WHISKDIR
--
To stop receiving notification emails like this one, please contact
houshengbo@apache.org.