You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by pd...@apache.org on 2018/05/15 22:47:29 UTC
[incubator-openwhisk] branch master updated: Assure all Dockerfiles
have ASF header. (#3659)
This is an automated email from the ASF dual-hosted git repository.
pdesai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 6397912 Assure all Dockerfiles have ASF header. (#3659)
6397912 is described below
commit 6397912386537056b295300a7c262218047d60ae
Author: Matt Rutkowski <mr...@us.ibm.com>
AuthorDate: Tue May 15 17:47:25 2018 -0500
Assure all Dockerfiles have ASF header. (#3659)
* Assure all Dockerfiles have ASF header.
* Use mini header for all Dockerfiles
---
actionRuntimes/actionProxy/Dockerfile | 3 +++
actionRuntimes/javaAction/Dockerfile | 3 +++
actionRuntimes/nodejs6Action/Dockerfile | 3 +++
actionRuntimes/nodejs8Action/Dockerfile | 3 +++
actionRuntimes/php7.1Action/Dockerfile | 3 +++
actionRuntimes/python2Action/Dockerfile | 3 +++
actionRuntimes/pythonAction/Dockerfile | 3 +++
actionRuntimes/swift3.1.1Action/Dockerfile | 3 +++
actionRuntimes/swift4.1Action/Dockerfile | 3 +++
common/scala/Dockerfile | 15 +--------------
core/controller/Dockerfile | 15 +--------------
core/invoker/Dockerfile | 15 +--------------
sdk/docker/Dockerfile | 4 +++-
13 files changed, 33 insertions(+), 43 deletions(-)
diff --git a/actionRuntimes/actionProxy/Dockerfile b/actionRuntimes/actionProxy/Dockerfile
index 5ca674f..32bf71b 100644
--- a/actionRuntimes/actionProxy/Dockerfile
+++ b/actionRuntimes/actionProxy/Dockerfile
@@ -1,2 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
# Dockerfile for docker skeleton (useful for running blackbox binaries, scripts, or Python 3 actions) .
FROM openwhisk/dockerskeleton:1.3.0
diff --git a/actionRuntimes/javaAction/Dockerfile b/actionRuntimes/javaAction/Dockerfile
index 4fd54cb..8c5c1ac 100644
--- a/actionRuntimes/javaAction/Dockerfile
+++ b/actionRuntimes/javaAction/Dockerfile
@@ -1 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
FROM openwhisk/java8action:1.1.0
diff --git a/actionRuntimes/nodejs6Action/Dockerfile b/actionRuntimes/nodejs6Action/Dockerfile
index 17541e0..1a382ff 100644
--- a/actionRuntimes/nodejs6Action/Dockerfile
+++ b/actionRuntimes/nodejs6Action/Dockerfile
@@ -1 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
FROM openwhisk/nodejs6action:1.9.0
diff --git a/actionRuntimes/nodejs8Action/Dockerfile b/actionRuntimes/nodejs8Action/Dockerfile
index 2853c5b..4ae3778 100644
--- a/actionRuntimes/nodejs8Action/Dockerfile
+++ b/actionRuntimes/nodejs8Action/Dockerfile
@@ -1 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
FROM openwhisk/action-nodejs-v8:1.6.0
diff --git a/actionRuntimes/php7.1Action/Dockerfile b/actionRuntimes/php7.1Action/Dockerfile
index 0b69414..885c6ba 100644
--- a/actionRuntimes/php7.1Action/Dockerfile
+++ b/actionRuntimes/php7.1Action/Dockerfile
@@ -1 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
FROM openwhisk/action-php-v7.1:1.0.0
diff --git a/actionRuntimes/python2Action/Dockerfile b/actionRuntimes/python2Action/Dockerfile
index a3ff63e..f06d8c4 100644
--- a/actionRuntimes/python2Action/Dockerfile
+++ b/actionRuntimes/python2Action/Dockerfile
@@ -1 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
FROM openwhisk/python2action:1.0.0
diff --git a/actionRuntimes/pythonAction/Dockerfile b/actionRuntimes/pythonAction/Dockerfile
index 1f67c38..ccc727f 100644
--- a/actionRuntimes/pythonAction/Dockerfile
+++ b/actionRuntimes/pythonAction/Dockerfile
@@ -1 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
FROM openwhisk/python3action:1.0.0
diff --git a/actionRuntimes/swift3.1.1Action/Dockerfile b/actionRuntimes/swift3.1.1Action/Dockerfile
index 1f1de15..f735d27 100755
--- a/actionRuntimes/swift3.1.1Action/Dockerfile
+++ b/actionRuntimes/swift3.1.1Action/Dockerfile
@@ -1 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
FROM openwhisk/action-swift-v3.1.1:1.0.0
diff --git a/actionRuntimes/swift4.1Action/Dockerfile b/actionRuntimes/swift4.1Action/Dockerfile
index a0408c1..fda4404 100755
--- a/actionRuntimes/swift4.1Action/Dockerfile
+++ b/actionRuntimes/swift4.1Action/Dockerfile
@@ -1 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
FROM openwhisk/action-swift-v4.1:1.0.5
diff --git a/common/scala/Dockerfile b/common/scala/Dockerfile
index 885880d..9e5ac3b 100644
--- a/common/scala/Dockerfile
+++ b/common/scala/Dockerfile
@@ -1,18 +1,5 @@
-#
# 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.
-#
+# license agreements; and to You under the Apache License, Version 2.0.
FROM alpine:3.6
diff --git a/core/controller/Dockerfile b/core/controller/Dockerfile
index 32fc06f..23e274d 100644
--- a/core/controller/Dockerfile
+++ b/core/controller/Dockerfile
@@ -1,18 +1,5 @@
-#
# 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.
-#
+# license agreements; and to You under the Apache License, Version 2.0.
FROM scala
diff --git a/core/invoker/Dockerfile b/core/invoker/Dockerfile
index 894d367..d1c5d8c 100644
--- a/core/invoker/Dockerfile
+++ b/core/invoker/Dockerfile
@@ -1,18 +1,5 @@
-#
# 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.
-#
+# license agreements; and to You under the Apache License, Version 2.0.
FROM scala
diff --git a/sdk/docker/Dockerfile b/sdk/docker/Dockerfile
index 5a448e6..d0ae174 100644
--- a/sdk/docker/Dockerfile
+++ b/sdk/docker/Dockerfile
@@ -1,3 +1,5 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements; and to You under the Apache License, Version 2.0.
+
# Dockerfile for example whisk docker action
FROM openwhisk/example:1.0.0
-
--
To stop receiving notification emails like this one, please contact
pdesai@apache.org.