Skip to content

Commit def189f

Browse files
authored
Merge pull request docker#9677 from glours/use-google-addlicence
use Google addlicense instead of kunalkushwaha/ltag
2 parents 085d8e9 + 4eb56fd commit def189f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ RUN --mount=target=. \
9090
make -f builder.Makefile test
9191

9292
FROM base AS check-license-headers
93-
RUN go install github.com/kunalkushwaha/ltag@latest
93+
RUN go install github.com/google/addlicense@latest
9494
RUN --mount=target=. \
9595
make -f builder.Makefile check-license-headers
9696

scripts/validate/fileheader

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env sh
22

3-
# Copyright Docker Compose CLI authors
3+
# Copyright 2020,2022 Docker Compose CLI authors
44

55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -16,12 +16,12 @@
1616

1717
set -eu -o pipefail
1818

19-
if ! command -v ltag; then
20-
>&2 echo "ERROR: ltag not found. Install with:"
21-
>&2 echo " go get -u github.com/kunalkushwaha/ltag"
19+
if ! command -v addlicense; then
20+
>&2 echo "ERROR: addlicense not found. Install with:"
21+
>&2 echo " go install -u github.com/google/addlicense@latest"
2222
exit 1
2323
fi
2424

2525
BASEPATH="${1-}"
2626

27-
ltag -t "${BASEPATH}scripts/validate/template" -excludes "validate testdata resolvepath" --check -v
27+
find . -regex '.*\.sh' -o -regex '.*\.go' -o -regex '.*Makefile' -o -regex '.*Dockerfile' | xargs addlicense -check -l apache -c 'Docker Compose CLI authors' -ignore validate -ignore testdata -ignore resolvepath -v 1>&2

0 commit comments

Comments
 (0)