refactor: DEST_IMAGE -> SDK_IMAGE

Agoric · Aug 28, 2023 · b9b8625 · b9b8625
1 parent 25e62da
commit b9b8625
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -293,7 +293,7 @@ jobs:
           cd packages/deployment/upgrade-test && \
             docker build \
               --build-arg BOOTSTRAP_MODE=${{ matrix.bootstrap-version }} \
-              --build-arg DEST_IMAGE=ghcr.io/agoric/agoric-sdk:latest \
+              --build-arg SDK_IMAGE=ghcr.io/agoric/agoric-sdk:latest \
               -t docker-upgrade-test:latest -f Dockerfile upgrade-test-scripts
       - name: docker run upgrade final stage
         run: docker run --env "DEST=0" docker-upgrade-test:latest

diff --git a/packages/deployment/upgrade-test/Dockerfile b/packages/deployment/upgrade-test/Dockerfile
@@ -1,6 +1,5 @@
 # Defaults
-# ??? why isn't this called SDK_IMAGE?
-ARG DEST_IMAGE=ghcr.io/agoric/agoric-sdk:dev
+ARG SDK_IMAGE=ghcr.io/agoric/agoric-sdk:dev
 ARG BOOTSTRAP_MODE=main
 
 ## FIRST LAYER
@@ -107,9 +106,9 @@ RUN . ./upgrade-test-scripts/start_to_to.sh
 
 # DEVELOPMENT LAYER
 # allow specifying a different SDK image
-ARG DEST_IMAGE
+ARG SDK_IMAGE
 #this is agoric-upgrade-11 / vstorage updates
-FROM ${DEST_IMAGE} as agoric-upgrade-11
+FROM ${SDK_IMAGE} as agoric-upgrade-11
 ARG BOOTSTRAP_MODE
 ENV THIS_NAME=agoric-upgrade-11 BOOTSTRAP_MODE=${BOOTSTRAP_MODE}
 COPY --from=agoric-upgrade-10-to-11 /root/.agoric /root/.agoric

diff --git a/packages/deployment/upgrade-test/Makefile b/packages/deployment/upgrade-test/Makefile
@@ -1,6 +1,6 @@
 REPOSITORY = agoric/upgrade-test
 # use :dev (latest prerelease image) unless we build local sdk
-DEST_IMAGE ?= $(if $(findstring local_sdk,$(MAKECMDGOALS)),ghcr.io/agoric/agoric-sdk:latest,ghcr.io/agoric/agoric-sdk:dev)
+SDK_IMAGE ?= $(if $(findstring local_sdk,$(MAKECMDGOALS)),ghcr.io/agoric/agoric-sdk:latest,ghcr.io/agoric/agoric-sdk:dev)
 BOOTSTRAP_MODE?=main
 ifeq ($(BOOTSTRAP_MODE),main)
 	TAG_SUFFIX=
@@ -20,7 +20,7 @@ local_sdk:
 	(cd ../ && make docker-build-sdk)
 
 BUILD = docker build --progress=plain $(BUILD_OPTS) \
-	--build-arg BOOTSTRAP_MODE=$(BOOTSTRAP_MODE) --build-arg DEST_IMAGE=$(DEST_IMAGE) \
+	--build-arg BOOTSTRAP_MODE=$(BOOTSTRAP_MODE) --build-arg SDK_IMAGE=$(SDK_IMAGE) \
 	-f Dockerfile upgrade-test-scripts
 
 agoric-upgrade-7-2:

diff --git a/packages/deployment/upgrade-test/Readme.md b/packages/deployment/upgrade-test/Readme.md
@@ -24,13 +24,13 @@ By default pre-releases use the lastest image tagged `dev` in our [container rep
 a specific build:
 
 ```shell
-DEST_IMAGE=docker pull ghcr.io/agoric/agoric-sdk:20230515033839-e56ae7
+SDK_IMAGE=docker pull ghcr.io/agoric/agoric-sdk:20230515033839-e56ae7
 ```
 To use a build based on local changes:
 ```shell
 # build ghcr.io/agoric/agoric-sdk:latest
 make local_sdk build
-# or DEST_IMAGE=ghcr.io/agoric/agoric-sdk:latest make build
+# or SDK_IMAGE=ghcr.io/agoric/agoric-sdk:latest make build
 ```
 
 **To run the latest upgrade interactively**