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-deploy-kube.git
The following commit(s) were added to refs/heads/master by this push: new b501005 Add the mini headers to Dockerfile and tpl file (#220) b501005 is described below commit b5010050944ee4c2b0eece8f41568b6a898023dc Author: Vincent <s...@us.ibm.com> AuthorDate: Wed Jun 13 12:20:28 2018 -0400 Add the mini headers to Dockerfile and tpl file (#220) --- docker/couchdb/Dockerfile | 18 ++---------------- docker/docker-pull/Dockerfile | 18 ++---------------- docker/invoker-agent/Dockerfile | 18 ++---------------- docker/kafkapkg-installer/Dockerfile | 18 ++---------------- docker/openwhisk-catalog/Dockerfile | 18 ++---------------- docker/routemgmt/Dockerfile | 18 ++---------------- helm/templates/_invokerHelpers.tpl | 3 +++ 7 files changed, 15 insertions(+), 96 deletions(-) diff --git a/docker/couchdb/Dockerfile b/docker/couchdb/Dockerfile index be643ca..3c58a22 100644 --- a/docker/couchdb/Dockerfile +++ b/docker/couchdb/Dockerfile @@ -1,19 +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. -# +# 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 apache/couchdb:2.1 diff --git a/docker/docker-pull/Dockerfile b/docker/docker-pull/Dockerfile index ee136b1..b81d304 100644 --- a/docker/docker-pull/Dockerfile +++ b/docker/docker-pull/Dockerfile @@ -1,19 +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. -# +# 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 ubuntu:latest diff --git a/docker/invoker-agent/Dockerfile b/docker/invoker-agent/Dockerfile index 000a54a..e791d5e 100644 --- a/docker/invoker-agent/Dockerfile +++ b/docker/invoker-agent/Dockerfile @@ -1,19 +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. -# +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +# license agreements; and to You under the Apache License, Version 2.0. ###### # build-stage diff --git a/docker/kafkapkg-installer/Dockerfile b/docker/kafkapkg-installer/Dockerfile index 4f53db8..88a0c50 100644 --- a/docker/kafkapkg-installer/Dockerfile +++ b/docker/kafkapkg-installer/Dockerfile @@ -1,19 +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. -# +# 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 ubuntu:latest diff --git a/docker/openwhisk-catalog/Dockerfile b/docker/openwhisk-catalog/Dockerfile index 4a1a749..0d7f59d 100644 --- a/docker/openwhisk-catalog/Dockerfile +++ b/docker/openwhisk-catalog/Dockerfile @@ -1,19 +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. -# +# 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 ubuntu:latest diff --git a/docker/routemgmt/Dockerfile b/docker/routemgmt/Dockerfile index ee36d20..c3560f1 100644 --- a/docker/routemgmt/Dockerfile +++ b/docker/routemgmt/Dockerfile @@ -1,19 +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. -# +# 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 ubuntu:latest diff --git a/helm/templates/_invokerHelpers.tpl b/helm/templates/_invokerHelpers.tpl index 54dc13d..7e7b2f3 100644 --- a/helm/templates/_invokerHelpers.tpl +++ b/helm/templates/_invokerHelpers.tpl @@ -1,3 +1,6 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +# license agreements; and to You under the Apache License, Version 2.0. + {{- define "docker_volumes" -}} - name: cgroup hostPath: -- To stop receiving notification emails like this one, please contact dgr...@apache.org.