From cdac316fca7f94e8211ee4102e4ba12bea3eab41 Mon Sep 17 00:00:00 2001 From: runseb Date: Fri, 4 Mar 2016 13:52:29 +0100 Subject: [PATCH] Correct and add a few license headers --- cmd/dm/dm.go | 16 ---------------- rootfs/expandybird/Dockerfile | 1 + rootfs/expandybird/Makefile | 1 + rootfs/manager/Dockerfile | 1 + rootfs/manager/Makefile | 1 + rootfs/resourcifier/Dockerfile | 1 + rootfs/resourcifier/Makefile | 1 + scripts/build-go.sh | 14 ++++++++++++++ scripts/common.sh | 14 ++++++++++++++ 9 files changed, 34 insertions(+), 16 deletions(-) diff --git a/cmd/dm/dm.go b/cmd/dm/dm.go index dc02d49cf..883c47277 100644 --- a/cmd/dm/dm.go +++ b/cmd/dm/dm.go @@ -1,19 +1,3 @@ -/* -Copyright 2016 The Kubernetes Authors All rights reserved. - -Licensed 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. -*/ - /* Copyright 2015 The Kubernetes Authors All rights reserved. diff --git a/rootfs/expandybird/Dockerfile b/rootfs/expandybird/Dockerfile index 814303c76..d1de3f72e 100644 --- a/rootfs/expandybird/Dockerfile +++ b/rootfs/expandybird/Dockerfile @@ -11,6 +11,7 @@ # 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 alpine:3.3 COPY . / diff --git a/rootfs/expandybird/Makefile b/rootfs/expandybird/Makefile index a7baecf58..d6b662500 100644 --- a/rootfs/expandybird/Makefile +++ b/rootfs/expandybird/Makefile @@ -11,6 +11,7 @@ # 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. + DOCKER_REGISTRY := gcr.io PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) IMAGE ?= expandybird diff --git a/rootfs/manager/Dockerfile b/rootfs/manager/Dockerfile index 79e292f51..02e615d5d 100644 --- a/rootfs/manager/Dockerfile +++ b/rootfs/manager/Dockerfile @@ -11,6 +11,7 @@ # 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 alpine:3.3 COPY . / EXPOSE 8080 diff --git a/rootfs/manager/Makefile b/rootfs/manager/Makefile index e116a491f..f8276efa7 100644 --- a/rootfs/manager/Makefile +++ b/rootfs/manager/Makefile @@ -11,6 +11,7 @@ # 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. + DOCKER_REGISTRY := gcr.io PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) IMAGE ?= manager diff --git a/rootfs/resourcifier/Dockerfile b/rootfs/resourcifier/Dockerfile index a9309bdb0..8d168e844 100644 --- a/rootfs/resourcifier/Dockerfile +++ b/rootfs/resourcifier/Dockerfile @@ -11,6 +11,7 @@ # 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 alpine:3.3 COPY . / EXPOSE 8080 diff --git a/rootfs/resourcifier/Makefile b/rootfs/resourcifier/Makefile index 26a42b2e4..a02d14728 100644 --- a/rootfs/resourcifier/Makefile +++ b/rootfs/resourcifier/Makefile @@ -11,6 +11,7 @@ # 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. + DOCKER_REGISTRY := gcr.io PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) IMAGE ?= resourcifier diff --git a/scripts/build-go.sh b/scripts/build-go.sh index b15b1bcd7..6d38579b8 100755 --- a/scripts/build-go.sh +++ b/scripts/build-go.sh @@ -1,4 +1,18 @@ #!/usr/bin/env bash +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# Licensed 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. + set -o errexit set -o pipefail diff --git a/scripts/common.sh b/scripts/common.sh index f1c819213..3d8fc2643 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -1,4 +1,18 @@ #!/usr/bin/env bash +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# Licensed 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. + set -o errexit set -o pipefail