From b6cbf457bab5cd90da0b3bdd882d6ee0497bd34d Mon Sep 17 00:00:00 2001 From: James Callahan Date: Tue, 18 Apr 2023 11:10:17 +1000 Subject: [PATCH 1/3] Add org.opencontainers.image.source label to docker images This label is used by e.g. renovate to show changelog updates --- Dockerfile | 1 + Dockerfile.local | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 2cb99b48..4eee7eb3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,6 +52,7 @@ RUN GIT_VERSION=$service_controller_git_version && \ FROM $base_image ARG service_alias ARG work_dir=/github.com/aws-controllers-k8s/$service_alias-controller +LABEL org.opencontainers.image.source=https://github.com/aws-controllers-k8s/$service_alias-controller WORKDIR / COPY --from=builder $work_dir/bin/controller $work_dir/LICENSE $work_dir/ATTRIBUTION.md /bin/ # Make this image non-root by default diff --git a/Dockerfile.local b/Dockerfile.local index f2e144ff..85b10d87 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -64,6 +64,7 @@ RUN GIT_VERSION=$service_controller_git_version && \ FROM $base_image ARG service_alias ARG work_dir=/github.com/aws-controllers-k8s/$service_alias-controller +LABEL org.opencontainers.image.source=https://github.com/aws-controllers-k8s/$service_alias-controller WORKDIR / COPY --from=builder $work_dir/bin/controller $work_dir/LICENSE $work_dir/ATTRIBUTION.md /bin/ USER 1000 From f675121d2cb77488ffd53e26cddf0d7f354cdeb6 Mon Sep 17 00:00:00 2001 From: James Callahan Date: Tue, 18 Apr 2023 11:13:47 +1000 Subject: [PATCH 2/3] Add org.opencontainers.image.base.name label to docker image --- Dockerfile | 2 ++ Dockerfile.local | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 4eee7eb3..bf8343dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,6 +50,8 @@ RUN GIT_VERSION=$service_controller_git_version && \ -a -o $work_dir/bin/controller $work_dir/cmd/controller/main.go FROM $base_image +ARG base_image +LABEL org.opencontainers.image.base.name=$base_image ARG service_alias ARG work_dir=/github.com/aws-controllers-k8s/$service_alias-controller LABEL org.opencontainers.image.source=https://github.com/aws-controllers-k8s/$service_alias-controller diff --git a/Dockerfile.local b/Dockerfile.local index 85b10d87..cc749a58 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -62,6 +62,8 @@ RUN GIT_VERSION=$service_controller_git_version && \ -a -o $work_dir/bin/controller $work_dir/cmd/controller/main.go FROM $base_image +ARG base_image +LABEL org.opencontainers.image.base.name=$base_image ARG service_alias ARG work_dir=/github.com/aws-controllers-k8s/$service_alias-controller LABEL org.opencontainers.image.source=https://github.com/aws-controllers-k8s/$service_alias-controller From 03f7d5dcd5b5bf088c5dd9cfda3ceb143c9896be Mon Sep 17 00:00:00 2001 From: James Callahan Date: Tue, 18 Apr 2023 11:15:47 +1000 Subject: [PATCH 3/3] Add org.opencontainers.image.version label to docker image --- Dockerfile | 2 ++ Dockerfile.local | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index bf8343dc..f5ef2e19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,8 +53,10 @@ FROM $base_image ARG base_image LABEL org.opencontainers.image.base.name=$base_image ARG service_alias +ARG service_controller_git_version ARG work_dir=/github.com/aws-controllers-k8s/$service_alias-controller LABEL org.opencontainers.image.source=https://github.com/aws-controllers-k8s/$service_alias-controller +LABEL org.opencontainers.image.version=$service_controller_git_version WORKDIR / COPY --from=builder $work_dir/bin/controller $work_dir/LICENSE $work_dir/ATTRIBUTION.md /bin/ # Make this image non-root by default diff --git a/Dockerfile.local b/Dockerfile.local index cc749a58..b813fb25 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -65,8 +65,10 @@ FROM $base_image ARG base_image LABEL org.opencontainers.image.base.name=$base_image ARG service_alias +ARG service_controller_git_version ARG work_dir=/github.com/aws-controllers-k8s/$service_alias-controller LABEL org.opencontainers.image.source=https://github.com/aws-controllers-k8s/$service_alias-controller +LABEL org.opencontainers.image.version=$service_controller_git_version WORKDIR / COPY --from=builder $work_dir/bin/controller $work_dir/LICENSE $work_dir/ATTRIBUTION.md /bin/ USER 1000