From 5fb2a44e82ffc4bb793e74a6e5ff8fd4da68d169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20St=C3=A4bler?= Date: Mon, 18 Nov 2024 07:35:18 -0700 Subject: [PATCH] Cleanup LICENSE copy (#427) --- cmd/generate/dockerfile-templates/DefaultDockerfile.template | 2 +- cmd/generate/dockerfile-templates/FuncUtilDockerfile.template | 2 +- .../openshift/ci-operator/knative-images/discover/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/generate/dockerfile-templates/DefaultDockerfile.template b/cmd/generate/dockerfile-templates/DefaultDockerfile.template index 1e1b94c3..e0a2be0d 100644 --- a/cmd/generate/dockerfile-templates/DefaultDockerfile.template +++ b/cmd/generate/dockerfile-templates/DefaultDockerfile.template @@ -21,7 +21,7 @@ ARG VERSION={{.version}} {{- end }} COPY --from=builder /usr/bin/main {{.app_file}} -COPY --from=builder /workspace/LICENSE /licenses/ +COPY LICENSE /licenses/ USER 65532 diff --git a/cmd/generate/dockerfile-templates/FuncUtilDockerfile.template b/cmd/generate/dockerfile-templates/FuncUtilDockerfile.template index a461e04e..88751af8 100644 --- a/cmd/generate/dockerfile-templates/FuncUtilDockerfile.template +++ b/cmd/generate/dockerfile-templates/FuncUtilDockerfile.template @@ -23,7 +23,7 @@ RUN microdnf install socat tar {{- end }} COPY --from=builder /usr/bin/main {{.app_file}} -COPY --from=builder /workspace/LICENSE /licenses/ +COPY LICENSE /licenses/ RUN ln -s {{.app_file}} /usr/local/bin/deploy && \ ln -s {{.app_file}} /usr/local/bin/scaffold && \ diff --git a/pkg/project/testoutput/openshift/ci-operator/knative-images/discover/Dockerfile b/pkg/project/testoutput/openshift/ci-operator/knative-images/discover/Dockerfile index 23e5ab9c..b808fe85 100755 --- a/pkg/project/testoutput/openshift/ci-operator/knative-images/discover/Dockerfile +++ b/pkg/project/testoutput/openshift/ci-operator/knative-images/discover/Dockerfile @@ -19,7 +19,7 @@ RUN microdnf update tzdata -y && microdnf reinstall tzdata -y RUN microdnf install rsync COPY --from=builder /usr/bin/main /usr/bin/discover -COPY --from=builder /workspace/LICENSE /licenses/ +COPY LICENSE /licenses/ USER 65532