better handling of incremental update of cached docker CI containers

Project-Faster · Apr 28, 2024 · dbb9320 · dbb9320
1 parent eff6954
commit dbb9320
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/docker/server-env/docker-compose.yml b/docker/server-env/docker-compose.yml
@@ -20,13 +20,12 @@ services:
       - QPEP_SLOWSTART=${QPEP_SLOWSTART}
       - QPEP_ADDRESS:${QPEP_ADDRESS}
       - QPEP_GATEWAY:127.0.0.1
+      - GO_VERSION=${GO_VERSION}
+      - QPEP_REPO=${QPEP_REPO}
+      - QPEP_BRANCH=${QPEP_BRANCH}
+      - QPEP_REV=${QPEP_REV}
     build:
       context: server/
-      args:
-        - GO_VERSION=${GO_VERSION}
-        - QPEP_REPO=${QPEP_REPO}
-        - QPEP_BRANCH=${QPEP_BRANCH}
-        - QPEP_REV=${QPEP_REV}
     extra_hosts:
       - "MQTT:${SERVER_ADDRESS}"
     ports:

diff --git a/docker/server-env/server/Dockerfile b/docker/server-env/server/Dockerfile
@@ -6,16 +6,16 @@ ENV CGO_ENABLED "1"
 ENV GOROOT "/opt/go"
 ENV GOPATH "/opt/gopath"
 ENV BUILDKIT_PROGRESS "plain"
+
 ENV QPEP_BACKEND="quic-go"
 ENV QPEP_CCA="reno"
 ENV QPEP_SLOWSTART="basic"
 ENV QPEP_ADDRESS="127.0.0.1"
 ENV QPEP_GATEWAY="127.0.0.1"
-
-ARG GO_VERSION="1.20.14"
-ARG QPEP_REPO="https://github.com/Project-Faster/qpep.git"
-ARG QPEP_BRANCH="main"
-ARG QPEP_REV="HEAD"
+ENV GO_VERSION="1.20.14"
+ENV QPEP_REPO="https://github.com/Project-Faster/qpep.git"
+ENV QPEP_BRANCH="main"
+ENV QPEP_REV="HEAD"
 
 USER root