From 06cb924bf1ae14caff13393a804a5ccc634a09c0 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Thu, 27 Jun 2024 08:42:38 -0700 Subject: [PATCH 1/2] APIGOV-28152 - update alpine images --- build/discovery/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/discovery/Dockerfile b/build/discovery/Dockerfile index 8a8c3f0..45dd505 100644 --- a/build/discovery/Dockerfile +++ b/build/discovery/Dockerfile @@ -1,6 +1,6 @@ # Build image -# golang:1.22.3-alpine3.20 linux/amd64 -FROM docker.io/golang@sha256:421bc7f4b90d042c56282bb894451108f8ab886687e1b73abaefad31ab10a14d AS builder +# golang:1.22.4-alpine3.20 linux/amd64 +FROM docker.io/golang@sha256:ace6cc3fe58d0c7b12303c57afe6d6724851152df55e08057b43990b927ad5e8 AS builder ARG commit_id ARG version @@ -40,8 +40,8 @@ RUN addgroup -g 2500 axway && adduser -u 2500 -D -G axway axway RUN chown -R axway:axway /discovery_agent USER axway -# alpine 3.20 linux/amd64 -FROM docker.io/alpine@sha256:77726ef6b57ddf65bb551896826ec38bc3e53f75cdde31354fbffb4f25238ebd +# alpine 3.20.1 linux/amd64 +FROM docker.io/alpine@sha256:b89d9c93e9ed3597455c90a0b88a8bbb5cb7188438f70953fede212a0c4394e0 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=builder /etc/passwd /etc/passwd From 275e0cd064fd8f27081aec72ae64ec3881f3e56e Mon Sep 17 00:00:00 2001 From: dfeldick Date: Thu, 27 Jun 2024 09:16:33 -0700 Subject: [PATCH 2/2] APIGOV-28152 - fix image --- build/traceability/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/traceability/Dockerfile b/build/traceability/Dockerfile index c43dcab..56688e4 100644 --- a/build/traceability/Dockerfile +++ b/build/traceability/Dockerfile @@ -1,6 +1,6 @@ # Build image -# golang:1.22.3-alpine3.20 linux/amd64 -FROM docker.io/golang@sha256:421bc7f4b90d042c56282bb894451108f8ab886687e1b73abaefad31ab10a14d AS builder +# golang:1.22.4-alpine3.20 linux/amd64 +FROM docker.io/golang@sha256:ace6cc3fe58d0c7b12303c57afe6d6724851152df55e08057b43990b927ad5e8 AS builder ARG commit_id ARG version @@ -40,7 +40,7 @@ RUN chown -R ${APP_USER}:${APP_USER} /traceability_agent USER ${APP_USER} # alpine 3.20 linux/amd64 -FROM docker.io/alpine@sha256:77726ef6b57ddf65bb551896826ec38bc3e53f75cdde31354fbffb4f25238ebd +FROM docker.io/alpine@sha256:b89d9c93e9ed3597455c90a0b88a8bbb5cb7188438f70953fede212a0c4394e0 ENV APP_USER axway