From e63baacc34cd3a5e271af848777f72885f47a964 Mon Sep 17 00:00:00 2001
From: dfeldick <dfeldick@axway.com>
Date: Wed, 29 May 2024 13:56:07 -0700
Subject: [PATCH 1/2] APIGOV-27660 - update images

---
 discovery/docker/Dockerfile    |  9 ++++-----
 traceability/docker/Dockerfile | 11 +++++------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/discovery/docker/Dockerfile b/discovery/docker/Dockerfile
index 2fd52eb..05b19ef 100644
--- a/discovery/docker/Dockerfile
+++ b/discovery/docker/Dockerfile
@@ -1,6 +1,6 @@
 # Build image
-# golang:1.21.6-alpine3.19 linux/amd64
-FROM docker.io/golang@sha256:2523a6f68a0f515fe251aad40b18545155135ca6a5b2e61da8254df9153e3648 AS builder
+# golang:1.22.3-alpine3.20 linux/amd64
+FROM docker.io/golang@sha256:421bc7f4b90d042c56282bb894451108f8ab886687e1b73abaefad31ab10a14d AS builder
 
 ARG commit_id
 ARG version
@@ -38,8 +38,8 @@ RUN addgroup -g 2500 ${APP_USER} && adduser -u 2500 -D -G ${APP_USER} ${APP_USER
 RUN chown -R ${APP_USER}:${APP_USER} ${AGENT}/bin/apigee_discovery_agent
 USER ${APP_USER}
 
-# alpine 3.19 linux/amd64
-FROM docker.io/alpine@sha256:13b7e62e8df80264dbb747995705a986aa530415763a6c58f84a3ca8af9a5bcd
+# alpine 3.20.0 linux/amd64
+FROM docker.io/alpine@sha256:sha256:77726ef6b57ddf65bb551896826ec38bc3e53f75cdde31354fbffb4f25238ebd
 
 ENV BASEPATH /go/src/github.com/Axway/agents-apigee
 ENV AGENT ${BASEPATH}/discovery
@@ -51,7 +51,6 @@ COPY --from=builder ${AGENT}/bin/apigee_discovery_agent /apigee_discovery_agent
 
 RUN mkdir /keys /specs && \
   chown -R ${APP_USER} /keys /specs && \
-  apk --no-cache add openssl libssl3 libcrypto3 musl musl-utils libc6-compat busybox curl && \
   touch /apigee_discovery_agent.yml && \
   find / -perm /6000 -type f -exec chmod a-s {} \; || true
 
diff --git a/traceability/docker/Dockerfile b/traceability/docker/Dockerfile
index 85f16d3..ed202fe 100644
--- a/traceability/docker/Dockerfile
+++ b/traceability/docker/Dockerfile
@@ -1,6 +1,6 @@
 # Build image
-# golang:1.21.6-alpine3.19 linux/amd64
-FROM docker.io/golang@sha256:2523a6f68a0f515fe251aad40b18545155135ca6a5b2e61da8254df9153e3648 AS builder
+# golang:1.22.3-alpine3.20 linux/amd64
+FROM docker.io/golang@sha256:421bc7f4b90d042c56282bb894451108f8ab886687e1b73abaefad31ab10a14d AS builder
 
 ARG commit_id
 ARG version
@@ -38,8 +38,8 @@ RUN addgroup -g 2500 ${APP_USER} && adduser -u 2500 -D -G ${APP_USER} ${APP_USER
 RUN chown -R ${APP_USER}:${APP_USER} ${AGENT}/bin/apigee_traceability_agent
 USER ${APP_USER}
 
-# alpine 3.18 linux/amd64
-FROM docker.io/alpine@sha256:13b7e62e8df80264dbb747995705a986aa530415763a6c58f84a3ca8af9a5bcd
+# alpine 3.20 linux/amd64
+FROM docker.io/alpine@sha256:77726ef6b57ddf65bb551896826ec38bc3e53f75cdde31354fbffb4f25238ebd
 
 ENV BASEPATH /go/src/github.com/Axway/agents-apigee
 ENV AGENT ${BASEPATH}/traceability
@@ -50,8 +50,7 @@ COPY --from=builder /etc/passwd /etc/passwd
 COPY --from=builder ${AGENT}/bin/apigee_traceability_agent /apigee_traceability_agent
 COPY --from=builder ${AGENT}/apigee_traceability_agent.yml /apigee_traceability_agent.yml
 
-RUN apk --no-cache add openssl libssl3 libcrypto3 musl musl-utils libc6-compat busybox curl && \
-  mkdir /keys /data && \
+RUN mkdir /keys /data && \
   chown -R ${APP_USER} /keys /data /apigee_traceability_agent.yml && \
   chmod go-w /apigee_traceability_agent.yml
 

From f73fce2bd91ad076c188e04aaffde979e6c73984 Mon Sep 17 00:00:00 2001
From: dfeldick <dfeldick@axway.com>
Date: Wed, 29 May 2024 14:22:15 -0700
Subject: [PATCH 2/2] APIGOV-27660 - fix

---
 discovery/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/discovery/docker/Dockerfile b/discovery/docker/Dockerfile
index 05b19ef..f58c742 100644
--- a/discovery/docker/Dockerfile
+++ b/discovery/docker/Dockerfile
@@ -39,7 +39,7 @@ RUN chown -R ${APP_USER}:${APP_USER} ${AGENT}/bin/apigee_discovery_agent
 USER ${APP_USER}
 
 # alpine 3.20.0 linux/amd64
-FROM docker.io/alpine@sha256:sha256:77726ef6b57ddf65bb551896826ec38bc3e53f75cdde31354fbffb4f25238ebd
+FROM docker.io/alpine@sha256:77726ef6b57ddf65bb551896826ec38bc3e53f75cdde31354fbffb4f25238ebd
 
 ENV BASEPATH /go/src/github.com/Axway/agents-apigee
 ENV AGENT ${BASEPATH}/discovery