Skip to content

Commit 78f85cb

Browse files
authored
Merge pull request #994 from crazy-max/update-license
dockerfile: update addlicense to v1.2.0
2 parents aa6e45f + 4750efa commit 78f85cb

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

hack/dockerfiles/license.Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
ARG ADDLICENSE_VERSION="v1.1.1"
18-
ARG ALPINE_VERSION="3.21"
19-
ARG GO_VERSION="1.23"
20-
ARG XX_VERSION="1.6.1"
17+
ARG ADDLICENSE_VERSION="v1.2.0"
18+
ARG ALPINE_VERSION="3.23"
19+
ARG GO_VERSION="1.26"
20+
ARG XX_VERSION="1.9.0"
2121

2222
ARG LICENSE_HOLDER="actions-toolkit authors"
2323
ARG LICENSE_TYPE="apache"
24-
ARG LICENSE_FILES=".*\(Dockerfile\|Makefile\|\.js\|\.ts\|\.hcl\|\.sh|\.ps1\)"
24+
ARG LICENSE_FILES=".*\(Dockerfile\|Makefile\|\.js\|\.cjs\|\.mjs\|\.ts\|\.hcl\|\.sh|\.ps1\)"
2525

2626
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
2727

@@ -52,9 +52,9 @@ ARG LICENSE_TYPE
5252
ARG LICENSE_FILES
5353
RUN --mount=type=bind,target=.,rw \
5454
--mount=from=addlicense,source=/out/addlicense,target=/usr/bin/addlicense \
55-
find . -regex "${LICENSE_FILES}" -not -path "./.yarn/*" -not -path "./node_modules/*" | xargs addlicense -c "$LICENSE_HOLDER" -l "$LICENSE_TYPE" && \
55+
find . -regex "${LICENSE_FILES}" -not -path "./.yarn/*" -not -path "./lib/*" -not -path "./node_modules/*" | xargs addlicense -c "$LICENSE_HOLDER" -l "$LICENSE_TYPE" && \
5656
mkdir /out && \
57-
find . -regex "${LICENSE_FILES}" -not -path "./.yarn/*" -not -path "./node_modules/*" | cpio -pdm /out
57+
find . -regex "${LICENSE_FILES}" -not -path "./.yarn/*" -not -path "./lib/*" -not -path "./node_modules/*" | cpio -pdm /out
5858

5959
FROM scratch AS update
6060
COPY --from=set /out /
@@ -65,4 +65,4 @@ ARG LICENSE_TYPE
6565
ARG LICENSE_FILES
6666
RUN --mount=type=bind,target=. \
6767
--mount=from=addlicense,source=/out/addlicense,target=/usr/bin/addlicense \
68-
find . -regex "${LICENSE_FILES}" -not -path "./.yarn/*" -not -path "./node_modules/*" | xargs addlicense -check -c "$LICENSE_HOLDER" -l "$LICENSE_TYPE"
68+
find . -regex "${LICENSE_FILES}" -not -path "./.yarn/*" -not -path "./lib/*" -not -path "./node_modules/*" | xargs addlicense -check -c "$LICENSE_HOLDER" -l "$LICENSE_TYPE"

0 commit comments

Comments
 (0)