From 386871de10ad42d27ec94dad7e2e39555e6996d1 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 15 Aug 2023 08:56:11 -0700 Subject: [PATCH 1/4] APIGOV-26106 - update golang to 1.21.0 --- discovery/docker/Dockerfile | 4 ++-- traceability/docker/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/discovery/docker/Dockerfile b/discovery/docker/Dockerfile index a8c1412..be46465 100644 --- a/discovery/docker/Dockerfile +++ b/discovery/docker/Dockerfile @@ -1,6 +1,6 @@ # Build image -# golang:1.20.6-alpine3.18 linux/amd64 -FROM docker.io/golang@sha256:6f592e0689192b7e477313264bb190024d654ef0a08fb1732af4f4b498a2e8ad AS builder +# golang:1.21.0-alpine3.18 linux/amd64 +FROM dockerhub.artifactory-phx.ecd.axway.int/golang@sha256:dd8888bb7f1b0b05e1e625aa29483f50f38a9b64073a4db00b04076cec52b71c ENV GOFLAGS "-mod=mod" ENV GOWORK "off" diff --git a/traceability/docker/Dockerfile b/traceability/docker/Dockerfile index 83341a6..b6d3c39 100644 --- a/traceability/docker/Dockerfile +++ b/traceability/docker/Dockerfile @@ -1,6 +1,6 @@ # Build image -# golang:1.20.6-alpine3.18 linux/amd64 -FROM docker.io/golang@sha256:6f592e0689192b7e477313264bb190024d654ef0a08fb1732af4f4b498a2e8ad AS builder +# golang:1.21.0-alpine3.18 linux/amd64 +FROM dockerhub.artifactory-phx.ecd.axway.int/golang@sha256:dd8888bb7f1b0b05e1e625aa29483f50f38a9b64073a4db00b04076cec52b71c ENV GOFLAGS "-mod=mod" ENV GOWORK "off" From 60464a3c21570d6549a5771316932d85f7316637 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 15 Aug 2023 09:13:09 -0700 Subject: [PATCH 2/4] APIGOV-26106 - fix --- discovery/docker/Dockerfile | 2 +- traceability/docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/discovery/docker/Dockerfile b/discovery/docker/Dockerfile index be46465..56575c7 100644 --- a/discovery/docker/Dockerfile +++ b/discovery/docker/Dockerfile @@ -1,6 +1,6 @@ # Build image # golang:1.21.0-alpine3.18 linux/amd64 -FROM dockerhub.artifactory-phx.ecd.axway.int/golang@sha256:dd8888bb7f1b0b05e1e625aa29483f50f38a9b64073a4db00b04076cec52b71c +FROM docker.io/golang@sha256:dd8888bb7f1b0b05e1e625aa29483f50f38a9b64073a4db00b04076cec52b71c ENV GOFLAGS "-mod=mod" ENV GOWORK "off" diff --git a/traceability/docker/Dockerfile b/traceability/docker/Dockerfile index b6d3c39..3d0bed4 100644 --- a/traceability/docker/Dockerfile +++ b/traceability/docker/Dockerfile @@ -1,6 +1,6 @@ # Build image # golang:1.21.0-alpine3.18 linux/amd64 -FROM dockerhub.artifactory-phx.ecd.axway.int/golang@sha256:dd8888bb7f1b0b05e1e625aa29483f50f38a9b64073a4db00b04076cec52b71c +FROM docker.io/golang@sha256:dd8888bb7f1b0b05e1e625aa29483f50f38a9b64073a4db00b04076cec52b71c ENV GOFLAGS "-mod=mod" ENV GOWORK "off" From d449f68f9093d7e27762c487334fac9a0750b7ad Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 15 Aug 2023 09:17:03 -0700 Subject: [PATCH 3/4] APIGOV-26106 - update golang version --- .github/workflows/apigee-agents-release.yml | 2 +- .github/workflows/build-apigee-discovery-agent.yml | 2 +- .github/workflows/build-apigee-traceability-agent.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/apigee-agents-release.yml b/.github/workflows/apigee-agents-release.yml index 14172ab..af2f3ba 100644 --- a/.github/workflows/apigee-agents-release.yml +++ b/.github/workflows/apigee-agents-release.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.21 - name: Build discovery agent working-directory: discovery diff --git a/.github/workflows/build-apigee-discovery-agent.yml b/.github/workflows/build-apigee-discovery-agent.yml index 3d65b8e..2413193 100644 --- a/.github/workflows/build-apigee-discovery-agent.yml +++ b/.github/workflows/build-apigee-discovery-agent.yml @@ -39,7 +39,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.21 - name: Build discovery agent working-directory: discovery diff --git a/.github/workflows/build-apigee-traceability-agent.yml b/.github/workflows/build-apigee-traceability-agent.yml index a12161e..2d5738f 100644 --- a/.github/workflows/build-apigee-traceability-agent.yml +++ b/.github/workflows/build-apigee-traceability-agent.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.21 - name: Test traceability agent working-directory: traceability From 1418b8e13b44e57adaf8477136c57b2ea5317690 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 15 Aug 2023 09:23:36 -0700 Subject: [PATCH 4/4] APIGOV-26106 - fix --- discovery/docker/Dockerfile | 2 +- traceability/docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/discovery/docker/Dockerfile b/discovery/docker/Dockerfile index 56575c7..488e8e7 100644 --- a/discovery/docker/Dockerfile +++ b/discovery/docker/Dockerfile @@ -1,6 +1,6 @@ # Build image # golang:1.21.0-alpine3.18 linux/amd64 -FROM docker.io/golang@sha256:dd8888bb7f1b0b05e1e625aa29483f50f38a9b64073a4db00b04076cec52b71c +FROM docker.io/golang@sha256:dd8888bb7f1b0b05e1e625aa29483f50f38a9b64073a4db00b04076cec52b71c AS builder ENV GOFLAGS "-mod=mod" ENV GOWORK "off" diff --git a/traceability/docker/Dockerfile b/traceability/docker/Dockerfile index 3d0bed4..781dc43 100644 --- a/traceability/docker/Dockerfile +++ b/traceability/docker/Dockerfile @@ -1,6 +1,6 @@ # Build image # golang:1.21.0-alpine3.18 linux/amd64 -FROM docker.io/golang@sha256:dd8888bb7f1b0b05e1e625aa29483f50f38a9b64073a4db00b04076cec52b71c +FROM docker.io/golang@sha256:dd8888bb7f1b0b05e1e625aa29483f50f38a9b64073a4db00b04076cec52b71c AS builder ENV GOFLAGS "-mod=mod" ENV GOWORK "off"