You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by oc...@apache.org on 2023/01/05 19:24:46 UTC
[trafficcontrol] branch master updated: Copy from alpine-based Golang image for alpine Docker images (#7267)
This is an automated email from the ASF dual-hosted git repository.
ocket8888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 098354c34a Copy from alpine-based Golang image for alpine Docker images (#7267)
098354c34a is described below
commit 098354c34acbda633b156257f885d181a762e4e0
Author: Zach Hoffman <zr...@apache.org>
AuthorDate: Thu Jan 5 12:24:37 2023 -0700
Copy from alpine-based Golang image for alpine Docker images (#7267)
* Copy from alpine-based Golang image for alpine Docker images
* build arg also
---
infrastructure/cdn-in-a-box/docker-compose.tr-load-tests.yml | 2 ++
infrastructure/cdn-in-a-box/docker-compose.traffic-ops-test.yml | 2 ++
infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile | 2 +-
infrastructure/cdn-in-a-box/traffic_router_load_test/Dockerfile | 2 +-
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/infrastructure/cdn-in-a-box/docker-compose.tr-load-tests.yml b/infrastructure/cdn-in-a-box/docker-compose.tr-load-tests.yml
index aeff4a8771..a4c4befcc8 100644
--- a/infrastructure/cdn-in-a-box/docker-compose.tr-load-tests.yml
+++ b/infrastructure/cdn-in-a-box/docker-compose.tr-load-tests.yml
@@ -31,6 +31,8 @@ services:
build:
context: ../..
dockerfile: infrastructure/cdn-in-a-box/traffic_router_load_test/Dockerfile
+ args:
+ - GO_VERSION=${GO_VERSION}
hostname: load-tests
env_file:
- variables.env
diff --git a/infrastructure/cdn-in-a-box/docker-compose.traffic-ops-test.yml b/infrastructure/cdn-in-a-box/docker-compose.traffic-ops-test.yml
index 04fe11a4a7..acd959a80e 100644
--- a/infrastructure/cdn-in-a-box/docker-compose.traffic-ops-test.yml
+++ b/infrastructure/cdn-in-a-box/docker-compose.traffic-ops-test.yml
@@ -31,6 +31,8 @@ services:
build:
context: ../..
dockerfile: infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile
+ args:
+ - GO_VERSION=${GO_VERSION}
env_file:
- variables.env
environment:
diff --git a/infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile b/infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile
index fe380b390f..41a2dcfeab 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile
@@ -16,7 +16,7 @@
# under the License.
ARG GO_VERSION
-FROM golang:${GO_VERSION} AS get-go
+FROM golang:${GO_VERSION}-alpine AS get-go
FROM alpine:3.13 AS integration-builder
COPY --from=get-go /usr/local/go /usr/local/go
diff --git a/infrastructure/cdn-in-a-box/traffic_router_load_test/Dockerfile b/infrastructure/cdn-in-a-box/traffic_router_load_test/Dockerfile
index 67f4ba6d23..d08f791117 100644
--- a/infrastructure/cdn-in-a-box/traffic_router_load_test/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_router_load_test/Dockerfile
@@ -16,7 +16,7 @@
# under the License.
ARG GO_VERSION
-FROM golang:${GO_VERSION} AS get-go
+FROM golang:${GO_VERSION}-alpine AS get-go
FROM alpine:3.14 AS load-test-builder
COPY --from=get-go /usr/local/go /usr/local/go