Skip to content
This repository has been archived by the owner on Sep 9, 2024. It is now read-only.

APIGOV-27660 - update images #105

Merged
merged 1 commit into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions build/discovery.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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}' \
Expand All @@ -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
Expand All @@ -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}
Expand Down
10 changes: 5 additions & 5 deletions build/traceability.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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}' \
Expand All @@ -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
Expand Down