Use marketplace.gcr.io and newer app images (#532)

GoogleCloudPlatform · Oct 17, 2022 · abf301b · abf301b
1 parent eab3f1e
commit abf301b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/tests/marketplace/deployer_envsubst_base/full/Makefile b/tests/marketplace/deployer_envsubst_base/full/Makefile
@@ -70,8 +70,8 @@ app/build:: .build/wordpress/deployer \
                             .build/var/TAG \
                             | .build/wordpress
 	$(call print_target, $@)
-	docker pull launcher.gcr.io/google/wordpress4-php5-apache
-	docker tag launcher.gcr.io/google/wordpress4-php5-apache "$(REGISTRY)/example/wordpress:$(TAG)"
+	docker pull marketplace.gcr.io/google/wordpress5-php7-apache
+	docker tag marketplace.gcr.io/google/wordpress5-php7-apache "$(REGISTRY)/example/wordpress:$(TAG)"
 	docker push "$(REGISTRY)/example/wordpress:$(TAG)"
 	@touch "$@"
 
@@ -91,8 +91,8 @@ app/build:: .build/wordpress/deployer \
                         .build/var/TAG \
                         | .build/wordpress
 	$(call print_target, $@)
-	docker pull launcher.gcr.io/google/mysql5
-	docker tag launcher.gcr.io/google/mysql5 "$(REGISTRY)/example/wordpress/mysql:$(TAG)"
+	docker pull marketplace.gcr.io/google/mysql5
+	docker tag marketplace.gcr.io/google/mysql5 "$(REGISTRY)/example/wordpress/mysql:$(TAG)"
 	docker push "$(REGISTRY)/example/wordpress/mysql:$(TAG)"
 	@touch "$@"
 

diff --git a/tests/marketplace/deployer_envsubst_base/full/deployer/Dockerfile b/tests/marketplace/deployer_envsubst_base/full/deployer/Dockerfile
@@ -1,5 +1,5 @@
 ARG MARKETPLACE_TOOLS_TAG
-FROM launcher.gcr.io/google/debian9 AS build
+FROM marketplace.gcr.io/google/debian10 AS build
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends gettext

diff --git a/tests/marketplace/deployer_envsubst_base/full/init/Dockerfile b/tests/marketplace/deployer_envsubst_base/full/init/Dockerfile
@@ -1,4 +1,4 @@
-FROM launcher.gcr.io/google/debian9
+FROM marketplace.gcr.io/google/debian10
 
 COPY metering.php.tmpl /
 COPY agent-config.yaml /