From 117c27117d829b9ca9b8dad3bccf90f678ca6d21 Mon Sep 17 00:00:00 2001
From: dfeldick <dfeldick@axway.com>
Date: Wed, 29 May 2024 14:02:09 -0700
Subject: [PATCH] APIGOV-27660 - update images

---
 build/discovery.Dockerfile    | 11 +++++------
 build/traceability.Dockerfile | 10 +++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/build/discovery.Dockerfile b/build/discovery.Dockerfile
index abdf57e..aa737c8 100644
--- a/build/discovery.Dockerfile
+++ b/build/discovery.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
@@ -17,7 +17,7 @@ WORKDIR ${BASEPATH}
 # Copy necessary files
 COPY . .
 
-RUN --mount=type=cache,target=/root/.cache/go-build \ 
+RUN --mount=type=cache,target=/root/.cache/go-build \
   go build -tags static_all \
   -ldflags="-X 'github.com/Axway/agent-sdk/pkg/cmd.BuildTime=${time}' \
   -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildVersion=${version}' \
@@ -31,8 +31,8 @@ RUN addgroup -g 2500 ${APP_USER} && adduser -u 2500 -D -G ${APP_USER} ${APP_USER
 RUN chown -R $APP_USER:$APP_USER ${BASEPATH}/bin/webmethods_discovery_agent
 USER ${APP_USER}
 
-# alpine 3.19 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-webmethods
 ENV APP_USER axway
@@ -45,7 +45,6 @@ COPY build/webmethods_discovery_agent.yml /webmethods_discovery_agent.yml
 
 RUN mkdir /keys && \
   chown -R axway /keys && \
-  apk --no-cache add openssl libssl3 libcrypto3 musl musl-utils libc6-compat busybox curl && \
   find / -perm /6000 -type f -exec chmod a-s {} \; || true
 
 USER ${APP_USER}
diff --git a/build/traceability.Dockerfile b/build/traceability.Dockerfile
index 55060a8..f381331 100644
--- a/build/traceability.Dockerfile
+++ b/build/traceability.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
@@ -17,7 +17,7 @@ WORKDIR ${BASEPATH}
 # Copy necessary files
 COPY . .
 
-RUN --mount=type=cache,target=/root/.cache/go-build \ 
+RUN --mount=type=cache,target=/root/.cache/go-build \
   go build -tags static_all \
   -ldflags="-X 'github.com/Axway/agent-sdk/pkg/cmd.BuildTime=${time}' \
   -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildVersion=${version}' \
@@ -31,8 +31,8 @@ RUN addgroup -g 2500 ${APP_USER} && adduser -u 2500 -D -G ${APP_USER} ${APP_USER
 RUN chown -R ${APP_USER}:${APP_USER} ${BASEPATH}/bin/webmethods_traceability_agent
 USER ${APP_USER}
 
-# alpine 3.18 linux/amd64 
-FROM docker.io/alpine@sha256:d695c3de6fcd8cfe3a6222b0358425d40adfd129a8a47c3416faff1a8aece389
+# alpine 3.20 linux/amd64
+FROM docker.io/alpine@sha256:77726ef6b57ddf65bb551896826ec38bc3e53f75cdde31354fbffb4f25238ebd
 
 ENV BASEPATH /go/src/github.com/Axway/agents-webmethods
 ENV APP_USER axway