From 97a50f8d512c7f14f6cc774c8d4ff1ae557d442f Mon Sep 17 00:00:00 2001 From: Guillaume Lours Date: Mon, 17 Aug 2020 15:18:47 +0200 Subject: [PATCH 1/4] Add CI step to check license headers Signed-off-by: Guillaume Lours --- .github/workflows/ci.yml | 3 +++ Dockerfile | 6 +++++ Makefile | 3 +++ builder.Makefile | 3 +++ scripts/validate/fileheader | 28 ++++++++++++++++++++++++ scripts/validate/template/bash.txt | 13 +++++++++++ scripts/validate/template/dockerfile.txt | 13 +++++++++++ scripts/validate/template/go.txt | 16 ++++++++++++++ scripts/validate/template/makefile.txt | 13 +++++++++++ 9 files changed, 98 insertions(+) create mode 100755 scripts/validate/fileheader create mode 100644 scripts/validate/template/bash.txt create mode 100644 scripts/validate/template/dockerfile.txt create mode 100644 scripts/validate/template/go.txt create mode 100644 scripts/validate/template/makefile.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ded3ed28..ebc9305ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,9 @@ jobs: - name: Checkout code into the Go module directory uses: actions/checkout@v2 + - name: Validate license headers + run: make validate + - name: Run golangci-lint run: | curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b . v1.30.0 diff --git a/Dockerfile b/Dockerfile index 4c8d90a39..bf015a783 100644 --- a/Dockerfile +++ b/Dockerfile @@ -84,3 +84,9 @@ RUN --mount=target=. \ BUILD_TAGS=${BUILD_TAGS} \ GIT_TAG=${GIT_TAG} \ make -f builder.Makefile test + +FROM base as check-license-headers +RUN go get -u github.com/kunalkushwaha/ltag +RUN --mount=target=. \ + --mount=type=cache,target=/root/.cache/go-build \ + make -f builder.Makefile check-license-headers \ No newline at end of file diff --git a/Makefile b/Makefile index 720c38a84..5976b81f4 100644 --- a/Makefile +++ b/Makefile @@ -78,6 +78,9 @@ serve: cli ## start server moby-cli-link: ## create com.docker.cli symlink if does not already exist ln -s $(MOBY_DOCKER) /usr/local/bin/com.docker.cli +validate: ## check license header for all files + @docker build . --target check-license-headers + help: ## Show help @echo Please specify a build target. The choices are: @grep -E '^[0-9a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' diff --git a/builder.Makefile b/builder.Makefile index b5e131484..7b5069114 100644 --- a/builder.Makefile +++ b/builder.Makefile @@ -56,6 +56,9 @@ test: lint: golangci-lint run --timeout 10m0s ./... +check-license-headers: + ./scripts/validate/fileheader + FORCE: .PHONY: all protos cli cross test lint diff --git a/scripts/validate/fileheader b/scripts/validate/fileheader new file mode 100755 index 000000000..5f07a6cd2 --- /dev/null +++ b/scripts/validate/fileheader @@ -0,0 +1,28 @@ +#!/usr/bin/env sh + +# Copyright The Compose Specification Authors. + +# 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 -eu -o pipefail + +if ! command -v ltag; then + >&2 echo "ERROR: ltag not found. Install with:" + >&2 echo " go get -u github.com/kunalkushwaha/ltag" + exit 1 +fi + +BASEPATH="${1-}" + +ltag -t "${BASEPATH}scripts/validate/template" -excludes "validate testdata" --check -v \ No newline at end of file diff --git a/scripts/validate/template/bash.txt b/scripts/validate/template/bash.txt new file mode 100644 index 000000000..6d89e6173 --- /dev/null +++ b/scripts/validate/template/bash.txt @@ -0,0 +1,13 @@ +# Copyright 2020 Docker, Inc. + +# 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. diff --git a/scripts/validate/template/dockerfile.txt b/scripts/validate/template/dockerfile.txt new file mode 100644 index 000000000..6d89e6173 --- /dev/null +++ b/scripts/validate/template/dockerfile.txt @@ -0,0 +1,13 @@ +# Copyright 2020 Docker, Inc. + +# 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. diff --git a/scripts/validate/template/go.txt b/scripts/validate/template/go.txt new file mode 100644 index 000000000..1cd855449 --- /dev/null +++ b/scripts/validate/template/go.txt @@ -0,0 +1,16 @@ +/* + Copyright 2020 Docker, Inc. + + 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. +*/ + diff --git a/scripts/validate/template/makefile.txt b/scripts/validate/template/makefile.txt new file mode 100644 index 000000000..6d89e6173 --- /dev/null +++ b/scripts/validate/template/makefile.txt @@ -0,0 +1,13 @@ +# Copyright 2020 Docker, Inc. + +# 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. From 95de770e875306a93b0fde3b1bf0e172fcd2407a Mon Sep 17 00:00:00 2001 From: Guillaume Lours Date: Mon, 17 Aug 2020 16:20:02 +0200 Subject: [PATCH 2/4] Update or add license header which are not valid Signed-off-by: Guillaume Lours --- Dockerfile | 7 +++++-- Makefile | 2 +- aci/aci_test.go | 16 ++++++++++++++++ aci/convert/container.go | 16 ++++++++++++++++ aci/login/client.go | 16 ++++++++++++++++ aci/login/storage_helper.go | 16 ++++++++++++++++ cli/cmd/login/azurelogin.go | 16 ++++++++++++++++ cli/cmd/logout/azure.go | 16 ++++++++++++++++ cli/cmd/logout/logout.go | 16 ++++++++++++++++ cli/cmd/mobyflags/mobyflags.go | 16 ++++++++++++++++ cli/mobycli/delegate_ecs.go | 16 ++++++++++++++++ cli/mobycli/exec_test.go | 16 ++++++++++++++++ docs/install/install.sh | 15 +++++++++++++++ ecs/backend.go | 3 +++ ecs/context.go | 3 +++ ecs/doc.go | 3 +++ prompt/prompt.go | 3 +++ server/proxy/containers_test.go | 16 ++++++++++++++++ tests/composefiles/aci-demo/db/Dockerfile | 13 +++++++++++++ tests/composefiles/aci-demo/web/Dockerfile | 13 +++++++++++++ tests/composefiles/aci-demo/words/Dockerfile | 13 +++++++++++++ utils/stringutils.go | 16 ++++++++++++++++ 22 files changed, 264 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index bf015a783..4bd56202b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -# syntax = docker/dockerfile:experimental +# syntax=docker/dockerfile:experimental + + # Copyright 2020 Docker, Inc. # Licensed under the Apache License, Version 2.0 (the "License"); @@ -89,4 +91,5 @@ FROM base as check-license-headers RUN go get -u github.com/kunalkushwaha/ltag RUN --mount=target=. \ --mount=type=cache,target=/root/.cache/go-build \ - make -f builder.Makefile check-license-headers \ No newline at end of file + make -f builder.Makefile check-license-headers + diff --git a/Makefile b/Makefile index 5976b81f4..b04403abf 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright 2020 The 2020 Docker, Inc. +# Copyright 2020 Docker, Inc. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aci/aci_test.go b/aci/aci_test.go index 145bf2802..22efe8eab 100644 --- a/aci/aci_test.go +++ b/aci/aci_test.go @@ -1,3 +1,19 @@ +/* + Copyright 2020 Docker, Inc. + + 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. +*/ + package aci import ( diff --git a/aci/convert/container.go b/aci/convert/container.go index 6929e97fd..742e7f7e1 100644 --- a/aci/convert/container.go +++ b/aci/convert/container.go @@ -1,3 +1,19 @@ +/* + Copyright 2020 Docker, Inc. + + 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. +*/ + package convert import ( diff --git a/aci/login/client.go b/aci/login/client.go index ad92441bb..6175fd2fd 100644 --- a/aci/login/client.go +++ b/aci/login/client.go @@ -1,3 +1,19 @@ +/* + Copyright 2020 Docker, Inc. + + 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. +*/ + package login import ( diff --git a/aci/login/storage_helper.go b/aci/login/storage_helper.go index 51d047462..2cc5d59b2 100644 --- a/aci/login/storage_helper.go +++ b/aci/login/storage_helper.go @@ -1,3 +1,19 @@ +/* + Copyright 2020 Docker, Inc. + + 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. +*/ + package login import ( diff --git a/cli/cmd/login/azurelogin.go b/cli/cmd/login/azurelogin.go index 4b7f3a28f..433ad5501 100644 --- a/cli/cmd/login/azurelogin.go +++ b/cli/cmd/login/azurelogin.go @@ -1,3 +1,19 @@ +/* + Copyright 2020 Docker, Inc. + + 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. +*/ + package login import ( diff --git a/cli/cmd/logout/azure.go b/cli/cmd/logout/azure.go index 478f821cf..a976b800b 100644 --- a/cli/cmd/logout/azure.go +++ b/cli/cmd/logout/azure.go @@ -1,3 +1,19 @@ +/* + Copyright 2020 Docker, Inc. + + 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. +*/ + package logout import ( diff --git a/cli/cmd/logout/logout.go b/cli/cmd/logout/logout.go index cfc63ed3e..bea8a8e53 100644 --- a/cli/cmd/logout/logout.go +++ b/cli/cmd/logout/logout.go @@ -1,3 +1,19 @@ +/* + Copyright 2020 Docker, Inc. + + 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. +*/ + package logout import ( diff --git a/cli/cmd/mobyflags/mobyflags.go b/cli/cmd/mobyflags/mobyflags.go index dcce02d8b..e6c7bcf1a 100644 --- a/cli/cmd/mobyflags/mobyflags.go +++ b/cli/cmd/mobyflags/mobyflags.go @@ -1,3 +1,19 @@ +/* + Copyright 2020 Docker, Inc. + + 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. +*/ + package mobyflags import ( diff --git a/cli/mobycli/delegate_ecs.go b/cli/mobycli/delegate_ecs.go index dccc7e095..65415e8c0 100644 --- a/cli/mobycli/delegate_ecs.go +++ b/cli/mobycli/delegate_ecs.go @@ -1,5 +1,21 @@ // +build !ecs +/* + Copyright 2020 Docker, Inc. + + 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. +*/ + package mobycli import "github.com/docker/api/context/store" diff --git a/cli/mobycli/exec_test.go b/cli/mobycli/exec_test.go index ed186b892..8c1f18c20 100644 --- a/cli/mobycli/exec_test.go +++ b/cli/mobycli/exec_test.go @@ -1,3 +1,19 @@ +/* + Copyright 2020 Docker, Inc. + + 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. +*/ + package mobycli import ( diff --git a/docs/install/install.sh b/docs/install/install.sh index 62fd74279..aa6800372 100755 --- a/docs/install/install.sh +++ b/docs/install/install.sh @@ -1,5 +1,20 @@ #!/bin/sh +# Copyright 2020 Docker, Inc. + +# 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. + + # Script to install the Docker ACI integration CLI on Ubuntu (Beta). set -eu diff --git a/ecs/backend.go b/ecs/backend.go index 02cf121a6..3b1e91327 100644 --- a/ecs/backend.go +++ b/ecs/backend.go @@ -2,10 +2,13 @@ /* Copyright 2020 Docker, Inc. + 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. diff --git a/ecs/context.go b/ecs/context.go index de7a34153..f6eaa0cab 100644 --- a/ecs/context.go +++ b/ecs/context.go @@ -2,10 +2,13 @@ /* Copyright 2020 Docker, Inc. + 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. diff --git a/ecs/doc.go b/ecs/doc.go index 2ea49a880..74f8b51d2 100644 --- a/ecs/doc.go +++ b/ecs/doc.go @@ -1,9 +1,12 @@ /* Copyright 2020 Docker, Inc. + 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. diff --git a/prompt/prompt.go b/prompt/prompt.go index 34623b933..d23904cc2 100644 --- a/prompt/prompt.go +++ b/prompt/prompt.go @@ -1,9 +1,12 @@ /* Copyright 2020 Docker, Inc. + 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. diff --git a/server/proxy/containers_test.go b/server/proxy/containers_test.go index 2c0aee2b9..93fe228a2 100644 --- a/server/proxy/containers_test.go +++ b/server/proxy/containers_test.go @@ -1,3 +1,19 @@ +/* + Copyright 2020 Docker, Inc. + + 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. +*/ + package proxy import ( diff --git a/tests/composefiles/aci-demo/db/Dockerfile b/tests/composefiles/aci-demo/db/Dockerfile index 35f0e8550..693541387 100644 --- a/tests/composefiles/aci-demo/db/Dockerfile +++ b/tests/composefiles/aci-demo/db/Dockerfile @@ -1,3 +1,16 @@ +# Copyright 2020 Docker, Inc. + +# 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. FROM postgres:10.0-alpine COPY words.sql /docker-entrypoint-initdb.d/ diff --git a/tests/composefiles/aci-demo/web/Dockerfile b/tests/composefiles/aci-demo/web/Dockerfile index 2dd000aef..47ed36860 100644 --- a/tests/composefiles/aci-demo/web/Dockerfile +++ b/tests/composefiles/aci-demo/web/Dockerfile @@ -1,3 +1,16 @@ +# Copyright 2020 Docker, Inc. + +# 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. # BUILD FROM ubuntu:latest diff --git a/tests/composefiles/aci-demo/words/Dockerfile b/tests/composefiles/aci-demo/words/Dockerfile index 6171e2361..f2c7652c5 100644 --- a/tests/composefiles/aci-demo/words/Dockerfile +++ b/tests/composefiles/aci-demo/words/Dockerfile @@ -1,3 +1,16 @@ +# Copyright 2020 Docker, Inc. + +# 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. # BUILD FROM openjdk:8u171-jdk-alpine as build diff --git a/utils/stringutils.go b/utils/stringutils.go index 6febf8e9a..d02a3a874 100644 --- a/utils/stringutils.go +++ b/utils/stringutils.go @@ -1,3 +1,19 @@ +/* + Copyright 2020 Docker, Inc. + + 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. +*/ + package utils // StringContains check if an array contains a specific value From 737a905f1dc06bd93add61460dc498d04964d18a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 17 Aug 2020 21:26:43 +0000 Subject: [PATCH 3/4] build(deps): bump gopkg.in/ini.v1 from 1.58.0 to 1.60.0 Bumps [gopkg.in/ini.v1](https://github.com/go-ini/ini) from 1.58.0 to 1.60.0. - [Release notes](https://github.com/go-ini/ini/releases) - [Commits](https://github.com/go-ini/ini/compare/v1.58.0...v1.60.0) Signed-off-by: dependabot-preview[bot] --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index f58ea079f..4f2a9d0bc 100644 --- a/go.mod +++ b/go.mod @@ -56,6 +56,6 @@ require ( google.golang.org/grpc v1.31.0 google.golang.org/protobuf v1.25.0 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect - gopkg.in/ini.v1 v1.58.0 + gopkg.in/ini.v1 v1.60.0 gotest.tools/v3 v3.0.2 ) diff --git a/go.sum b/go.sum index 37a78faeb..e467a51da 100644 --- a/go.sum +++ b/go.sum @@ -686,6 +686,8 @@ gopkg.in/ini.v1 v1.57.0 h1:9unxIsFcTt4I55uWluz+UmL95q4kdJ0buvQ1ZIqVQww= gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.58.0 h1:VdDvTzv/005R8vEFyQ56bpEnOKTNPbpJhL0VCohxlQw= gopkg.in/ini.v1 v1.58.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.60.0 h1:P5ZzC7RJO04094NJYlEnBdFK2wwmnCAy/+7sAzvWs60= +gopkg.in/ini.v1 v1.60.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= From 85ff0b053fbf1ed27ffce1697f9867857f022a6c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 17 Aug 2020 21:27:19 +0000 Subject: [PATCH 4/4] build(deps): bump github.com/aws/aws-sdk-go from 1.34.2 to 1.34.6 Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.34.2 to 1.34.6. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.34.2...v1.34.6) Signed-off-by: dependabot-preview[bot] --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index f58ea079f..9b905da35 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 github.com/Microsoft/hcsshim v0.8.9 // indirect - github.com/aws/aws-sdk-go v1.34.2 + github.com/aws/aws-sdk-go v1.34.6 github.com/buger/goterm v0.0.0-20200322175922-2f3e71b85129 github.com/compose-spec/compose-go v0.0.0-20200710075715-6fcc35384ee1 github.com/containerd/console v1.0.0 diff --git a/go.sum b/go.sum index 37a78faeb..7c8cb0037 100644 --- a/go.sum +++ b/go.sum @@ -82,6 +82,8 @@ github.com/aws/aws-sdk-go v1.33.21 h1:ziUemjajvLABlnJFe+8sM3fpqlg/DNA4944rUZ05Ph github.com/aws/aws-sdk-go v1.33.21/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.34.2 h1:9vCknCdTAmmV4ht7lPuda7aJXzllXwEQyCMZKJHjBrM= github.com/aws/aws-sdk-go v1.34.2/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.34.6 h1:2aPXQGkR6xeheN5dns13mSoDWeUlj4wDmfZ+8ZDHauw= +github.com/aws/aws-sdk-go v1.34.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/awslabs/goformation/v4 v4.8.0 h1:UiUhyokRy3suEqBXTnipvY8klqY3Eyl4GCH17brraEc= github.com/awslabs/goformation/v4 v4.8.0/go.mod h1:GcJULxCJfloT+3pbqCluXftdEK2AD/UqpS3hkaaBntg= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=