From 832bdbe86182ab4b276d17aa8ac18ac001eff59b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volkan=20=C3=96z=C3=A7elik?= Date: Fri, 25 Oct 2024 13:23:33 -0700 Subject: [PATCH] Fix tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Volkan Özçelik --- dockerfiles/example/init-container.Dockerfile | 6 +++--- dockerfiles/example/multiple-secrets.Dockerfile | 3 +-- dockerfiles/example/sdk-go.Dockerfile | 3 +-- dockerfiles/example/sidecar.Dockerfile | 2 +- dockerfiles/util/inspector.Dockerfile | 3 +-- dockerfiles/util/keygen.Dockerfile | 5 ++--- dockerfiles/vsecm-ist-fips/init-container.Dockerfile | 3 +-- dockerfiles/vsecm-ist-fips/keystone.Dockerfile | 2 +- dockerfiles/vsecm-ist-fips/relay-client.Dockerfile | 2 +- dockerfiles/vsecm-ist-fips/relay-server.Dockerfile | 2 +- dockerfiles/vsecm-ist-fips/safe.Dockerfile | 2 +- dockerfiles/vsecm-ist-fips/scout.Dockerfile | 3 +-- dockerfiles/vsecm-ist-fips/sentinel.Dockerfile | 2 +- dockerfiles/vsecm-ist-fips/sidecar.Dockerfile | 3 +-- dockerfiles/vsecm-ist/init-container.Dockerfile | 3 +-- dockerfiles/vsecm-ist/keystone.Dockerfile | 6 +++--- dockerfiles/vsecm-ist/relay-client.Dockerfile | 2 +- dockerfiles/vsecm-ist/relay-server.Dockerfile | 2 +- dockerfiles/vsecm-ist/safe.Dockerfile | 2 +- dockerfiles/vsecm-ist/scout.Dockerfile | 3 +-- dockerfiles/vsecm-ist/sentinel.Dockerfile | 2 +- dockerfiles/vsecm-ist/sidecar.Dockerfile | 3 +-- 22 files changed, 27 insertions(+), 37 deletions(-) diff --git a/dockerfiles/example/init-container.Dockerfile b/dockerfiles/example/init-container.Dockerfile index 0bc65166..30fcf2a4 100644 --- a/dockerfiles/example/init-container.Dockerfile +++ b/dockerfiles/example/init-container.Dockerfile @@ -9,16 +9,16 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder COPY app /build/app COPY core /build/core COPY lib /build/lib COPY examples /build/examples COPY vendor /build/vendor COPY go.mod /build/go.mod + WORKDIR /build -RUN CGO_ENABLED=0 GOOS=linux go build -mod vendor -a -o example \ - ./examples/using_init_container/main.go +RUN CGO_ENABLED=0 GOOS=linux go build -mod vendor -a -o example ./examples/using_init_container/main.go # generate clean, final image for end users FROM gcr.io/distroless/static-debian11 diff --git a/dockerfiles/example/multiple-secrets.Dockerfile b/dockerfiles/example/multiple-secrets.Dockerfile index e43ec3e5..18a39baf 100644 --- a/dockerfiles/example/multiple-secrets.Dockerfile +++ b/dockerfiles/example/multiple-secrets.Dockerfile @@ -9,11 +9,10 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder COPY app /build/app COPY core /build/core COPY lib /build/lib -COPY sdk /build/sdk COPY examples /build/examples COPY vendor /build/vendor COPY go.mod /build/go.mod diff --git a/dockerfiles/example/sdk-go.Dockerfile b/dockerfiles/example/sdk-go.Dockerfile index 1da68a4a..1de13737 100644 --- a/dockerfiles/example/sdk-go.Dockerfile +++ b/dockerfiles/example/sdk-go.Dockerfile @@ -9,11 +9,10 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder COPY app /build/app COPY core /build/core COPY lib /build/lib -COPY sdk /build/sdk COPY examples /build/examples COPY vendor /build/vendor COPY go.mod /build/go.mod diff --git a/dockerfiles/example/sidecar.Dockerfile b/dockerfiles/example/sidecar.Dockerfile index f126ba65..df17472e 100644 --- a/dockerfiles/example/sidecar.Dockerfile +++ b/dockerfiles/example/sidecar.Dockerfile @@ -9,7 +9,7 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder COPY app /build/app COPY core /build/core COPY lib /build/lib diff --git a/dockerfiles/util/inspector.Dockerfile b/dockerfiles/util/inspector.Dockerfile index 7345dc65..9403e852 100644 --- a/dockerfiles/util/inspector.Dockerfile +++ b/dockerfiles/util/inspector.Dockerfile @@ -9,13 +9,12 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder RUN mkdir /build COPY app /build/app COPY core /build/core COPY lib /build/lib -COPY sdk /build/sdk COPY vendor /build/vendor COPY go.mod /build/go.mod WORKDIR /build diff --git a/dockerfiles/util/keygen.Dockerfile b/dockerfiles/util/keygen.Dockerfile index e7cb83cb..dee6fe2a 100644 --- a/dockerfiles/util/keygen.Dockerfile +++ b/dockerfiles/util/keygen.Dockerfile @@ -9,7 +9,7 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder RUN mkdir /build COPY app /build/app @@ -18,8 +18,7 @@ COPY lib /build/lib COPY vendor /build/vendor COPY go.mod /build/go.mod WORKDIR /build -RUN CGO_ENABLED=0 GOOS=linux go build -mod vendor -a -o vsecm-keygen \ - ./app/keygen/cmd/main.go +RUN CGO_ENABLED=0 GOOS=linux go build -mod vendor -a -o vsecm-keygen ./app/keygen/cmd/main.go # generate clean, final image for end users FROM gcr.io/distroless/static-debian11 diff --git a/dockerfiles/vsecm-ist-fips/init-container.Dockerfile b/dockerfiles/vsecm-ist-fips/init-container.Dockerfile index b56885f0..f894ca6f 100644 --- a/dockerfiles/vsecm-ist-fips/init-container.Dockerfile +++ b/dockerfiles/vsecm-ist-fips/init-container.Dockerfile @@ -9,13 +9,12 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder RUN mkdir /build COPY app /build/app COPY core /build/core COPY lib /build/lib -COPY sdk /build/sdk COPY vendor /build/vendor COPY go.mod /build/go.mod WORKDIR /build diff --git a/dockerfiles/vsecm-ist-fips/keystone.Dockerfile b/dockerfiles/vsecm-ist-fips/keystone.Dockerfile index 9a52bb29..808a254a 100644 --- a/dockerfiles/vsecm-ist-fips/keystone.Dockerfile +++ b/dockerfiles/vsecm-ist-fips/keystone.Dockerfile @@ -9,7 +9,7 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder RUN mkdir /build COPY app /build/app diff --git a/dockerfiles/vsecm-ist-fips/relay-client.Dockerfile b/dockerfiles/vsecm-ist-fips/relay-client.Dockerfile index 61377ee2..7cadd42f 100644 --- a/dockerfiles/vsecm-ist-fips/relay-client.Dockerfile +++ b/dockerfiles/vsecm-ist-fips/relay-client.Dockerfile @@ -9,7 +9,7 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder RUN mkdir /build COPY app /build/app diff --git a/dockerfiles/vsecm-ist-fips/relay-server.Dockerfile b/dockerfiles/vsecm-ist-fips/relay-server.Dockerfile index 4197e3a0..c3fe1b7d 100644 --- a/dockerfiles/vsecm-ist-fips/relay-server.Dockerfile +++ b/dockerfiles/vsecm-ist-fips/relay-server.Dockerfile @@ -9,7 +9,7 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder RUN mkdir /build COPY app /build/app diff --git a/dockerfiles/vsecm-ist-fips/safe.Dockerfile b/dockerfiles/vsecm-ist-fips/safe.Dockerfile index 6b9abc7d..03eaee84 100644 --- a/dockerfiles/vsecm-ist-fips/safe.Dockerfile +++ b/dockerfiles/vsecm-ist-fips/safe.Dockerfile @@ -9,7 +9,7 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder RUN mkdir /build COPY app /build/app diff --git a/dockerfiles/vsecm-ist-fips/scout.Dockerfile b/dockerfiles/vsecm-ist-fips/scout.Dockerfile index f8cd900c..f163394f 100644 --- a/dockerfiles/vsecm-ist-fips/scout.Dockerfile +++ b/dockerfiles/vsecm-ist-fips/scout.Dockerfile @@ -9,12 +9,11 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder RUN mkdir /build COPY app /build/app COPY core /build/core COPY lib /build/lib -COPY sdk /build/sdk COPY vendor /build/vendor COPY go.mod /build/go.mod WORKDIR /build diff --git a/dockerfiles/vsecm-ist-fips/sentinel.Dockerfile b/dockerfiles/vsecm-ist-fips/sentinel.Dockerfile index ae7faa5e..52a40f44 100644 --- a/dockerfiles/vsecm-ist-fips/sentinel.Dockerfile +++ b/dockerfiles/vsecm-ist-fips/sentinel.Dockerfile @@ -9,7 +9,7 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder RUN mkdir /build COPY app /build/app COPY core /build/core diff --git a/dockerfiles/vsecm-ist-fips/sidecar.Dockerfile b/dockerfiles/vsecm-ist-fips/sidecar.Dockerfile index 955cdf78..2214a78e 100644 --- a/dockerfiles/vsecm-ist-fips/sidecar.Dockerfile +++ b/dockerfiles/vsecm-ist-fips/sidecar.Dockerfile @@ -10,12 +10,11 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder RUN mkdir /build COPY app /build/app COPY core /build/core COPY lib /build/lib -COPY sdk /build/sdk COPY vendor /build/vendor COPY go.mod /build/go.mod WORKDIR /build diff --git a/dockerfiles/vsecm-ist/init-container.Dockerfile b/dockerfiles/vsecm-ist/init-container.Dockerfile index 105e4890..fda6aacc 100644 --- a/dockerfiles/vsecm-ist/init-container.Dockerfile +++ b/dockerfiles/vsecm-ist/init-container.Dockerfile @@ -9,13 +9,12 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder RUN mkdir /build COPY app /build/app COPY core /build/core COPY lib /build/lib -COPY sdk /build/sdk COPY vendor /build/vendor COPY go.mod /build/go.mod WORKDIR /build diff --git a/dockerfiles/vsecm-ist/keystone.Dockerfile b/dockerfiles/vsecm-ist/keystone.Dockerfile index 8584cf58..2a6cb271 100644 --- a/dockerfiles/vsecm-ist/keystone.Dockerfile +++ b/dockerfiles/vsecm-ist/keystone.Dockerfile @@ -9,7 +9,7 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder RUN mkdir /build COPY app /build/app @@ -17,9 +17,9 @@ COPY core /build/core COPY lib /build/lib COPY vendor /build/vendor COPY go.mod /build/go.mod + WORKDIR /build -RUN CGO_ENABLED=0 GOOS=linux go build -mod vendor -a -o vsecm-keystone \ - ./app/keystone/cmd/main.go +RUN CGO_ENABLED=0 GOOS=linux go build -mod vendor -a -o vsecm-keystone ./app/keystone/cmd/main.go # generate clean, final image for end users FROM gcr.io/distroless/static-debian11 diff --git a/dockerfiles/vsecm-ist/relay-client.Dockerfile b/dockerfiles/vsecm-ist/relay-client.Dockerfile index b13a6de5..117335b5 100644 --- a/dockerfiles/vsecm-ist/relay-client.Dockerfile +++ b/dockerfiles/vsecm-ist/relay-client.Dockerfile @@ -9,7 +9,7 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder RUN mkdir /build COPY app /build/app diff --git a/dockerfiles/vsecm-ist/relay-server.Dockerfile b/dockerfiles/vsecm-ist/relay-server.Dockerfile index f19ae0f1..a70ac96b 100644 --- a/dockerfiles/vsecm-ist/relay-server.Dockerfile +++ b/dockerfiles/vsecm-ist/relay-server.Dockerfile @@ -9,7 +9,7 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder RUN mkdir /build COPY app /build/app diff --git a/dockerfiles/vsecm-ist/safe.Dockerfile b/dockerfiles/vsecm-ist/safe.Dockerfile index 690ebe17..f7033fd3 100644 --- a/dockerfiles/vsecm-ist/safe.Dockerfile +++ b/dockerfiles/vsecm-ist/safe.Dockerfile @@ -9,7 +9,7 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder RUN mkdir /build COPY app /build/app diff --git a/dockerfiles/vsecm-ist/scout.Dockerfile b/dockerfiles/vsecm-ist/scout.Dockerfile index c78530b7..32af47b0 100644 --- a/dockerfiles/vsecm-ist/scout.Dockerfile +++ b/dockerfiles/vsecm-ist/scout.Dockerfile @@ -9,12 +9,11 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder RUN mkdir /build COPY app /build/app COPY core /build/core COPY lib /build/lib -COPY sdk /build/sdk COPY vendor /build/vendor COPY go.mod /build/go.mod WORKDIR /build diff --git a/dockerfiles/vsecm-ist/sentinel.Dockerfile b/dockerfiles/vsecm-ist/sentinel.Dockerfile index a39ee565..3b71cd01 100644 --- a/dockerfiles/vsecm-ist/sentinel.Dockerfile +++ b/dockerfiles/vsecm-ist/sentinel.Dockerfile @@ -9,7 +9,7 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder RUN mkdir /build COPY app /build/app COPY core /build/core diff --git a/dockerfiles/vsecm-ist/sidecar.Dockerfile b/dockerfiles/vsecm-ist/sidecar.Dockerfile index fa90f923..3a4c4fe7 100644 --- a/dockerfiles/vsecm-ist/sidecar.Dockerfile +++ b/dockerfiles/vsecm-ist/sidecar.Dockerfile @@ -9,12 +9,11 @@ # */ # builder image -FROM golang:1.23.1-alpine3.20 AS builder +FROM golang:1.23.2-alpine3.20 AS builder RUN mkdir /build COPY app /build/app COPY core /build/core COPY lib /build/lib -COPY sdk /build/sdk COPY vendor /build/vendor COPY go.mod /build/go.mod WORKDIR /build