From abf301b66c0e0bfbde45eecc5102887eb3cbdc6c Mon Sep 17 00:00:00 2001 From: Erika Shiroma Date: Mon, 17 Oct 2022 11:11:58 -0700 Subject: [PATCH] Use marketplace.gcr.io and newer app images (#532) --- tests/marketplace/deployer_envsubst_base/full/Makefile | 8 ++++---- .../deployer_envsubst_base/full/deployer/Dockerfile | 2 +- .../deployer_envsubst_base/full/init/Dockerfile | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/marketplace/deployer_envsubst_base/full/Makefile b/tests/marketplace/deployer_envsubst_base/full/Makefile index 3bc4f140..e94e9eaa 100644 --- 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 index ada46788..cfa7697b 100644 --- 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 index 903bdecf..ee62fe8c 100644 --- 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 /