From ec97e15eb7418bb410ddebe4534fac72f7f0ab0d Mon Sep 17 00:00:00 2001
From: Jihui Nie <jihuinie@google.com>
Date: Mon, 15 Jul 2024 14:17:05 -0700
Subject: [PATCH] Second attempt to rename stack id google.min.22 to
 google.gae.22

PiperOrigin-RevId: 652596614
Change-Id: I1928d213f4b5f520bc0327419072e05edd770caa
---
 builders/gcp/base/google.min.22.builder.toml   | 2 +-
 stacks/google_min_22/build.Dockerfile          | 6 +++---
 stacks/google_min_22/build_structure_test.yaml | 4 ++--
 stacks/google_min_22/run.Dockerfile            | 6 +++---
 stacks/google_min_22/run_structure_test.yaml   | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/builders/gcp/base/google.min.22.builder.toml b/builders/gcp/base/google.min.22.builder.toml
index 993591902..e5312e812 100644
--- a/builders/gcp/base/google.min.22.builder.toml
+++ b/builders/gcp/base/google.min.22.builder.toml
@@ -484,7 +484,7 @@ description = "Ubuntu 18 base image with buildpacks for .NET, Go, Java, Node.js,
 
 
 [stack]
-  id = "google.min.22"
+  id = "google.gae.22"
   build-image = "gcr.io/gae-runtimes/buildpacks/stacks/google-min-22/build"
   run-image = "gcr.io/gae-runtimes/buildpacks/stacks/google-min-22/run"
 
diff --git a/stacks/google_min_22/build.Dockerfile b/stacks/google_min_22/build.Dockerfile
index 456d561ea..30cc37c3d 100644
--- a/stacks/google_min_22/build.Dockerfile
+++ b/stacks/google_min_22/build.Dockerfile
@@ -62,17 +62,17 @@ USER cnb
 ENV LANG="en_US.UTF-8"
 ENV LANGUAGE="en_US:en"
 ENV LC_ALL="en_US.UTF-8"
-ENV CNB_STACK_ID="google.min.22"
+ENV CNB_STACK_ID="google.gae.22"
 ENV CNB_USER_ID=${cnb_uid}
 ENV CNB_GROUP_ID=${cnb_gid}
 
 # Standard buildpacks metadata
-LABEL io.buildpacks.stack.id="google.min.22"
+LABEL io.buildpacks.stack.id="google.gae.22"
 LABEL io.buildpacks.stack.distro.name="Ubuntu"
 LABEL io.buildpacks.stack.distro.version="22.04"
 LABEL io.buildpacks.stack.maintainer="Google"
 LABEL io.buildpacks.stack.mixins="[]"
-LABEL io.buildpacks.stack.homepage \ 
+LABEL io.buildpacks.stack.homepage \
   "https://github.com/GoogleCloudPlatform/buildpacks/stacks/google-min-22"
 
 # Set $PORT to 8080 by default
diff --git a/stacks/google_min_22/build_structure_test.yaml b/stacks/google_min_22/build_structure_test.yaml
index 5e3af901c..6ce30dee6 100644
--- a/stacks/google_min_22/build_structure_test.yaml
+++ b/stacks/google_min_22/build_structure_test.yaml
@@ -25,14 +25,14 @@ metadataTest:
     - key: LC_ALL
       value: 'en_US.UTF-8'
     - key: 'CNB_STACK_ID'
-      value: 'google.min.22'
+      value: 'google.gae.22'
     - key: 'CNB_USER_ID'
       value: '1000'
     - key: 'CNB_GROUP_ID'
       value: '1000'
   labels:
     - key: 'io.buildpacks.stack.id'
-      value: 'google.min.22'
+      value: 'google.gae.22'
     - key: 'io.buildpacks.stack.distro.name'
       value: 'Ubuntu'
     - key: 'io.buildpacks.stack.distro.version'
diff --git a/stacks/google_min_22/run.Dockerfile b/stacks/google_min_22/run.Dockerfile
index ed3bb8582..673fb769b 100644
--- a/stacks/google_min_22/run.Dockerfile
+++ b/stacks/google_min_22/run.Dockerfile
@@ -64,17 +64,17 @@ USER cnb
 ENV LANG="en_US.UTF-8"
 ENV LANGUAGE="en_US:en"
 ENV LC_ALL="en_US.UTF-8"
-ENV CNB_STACK_ID="google.min.22"
+ENV CNB_STACK_ID="google.gae.22"
 ENV CNB_USER_ID=${cnb_uid}
 ENV CNB_GROUP_ID=${cnb_gid}
 
 # Standard buildpacks metadata
-LABEL io.buildpacks.stack.id="google.min.22"
+LABEL io.buildpacks.stack.id="google.gae.22"
 LABEL io.buildpacks.stack.distro.name="Ubuntu"
 LABEL io.buildpacks.stack.distro.version="22.04"
 LABEL io.buildpacks.stack.maintainer="Google"
 LABEL io.buildpacks.stack.mixins="[]"
-LABEL io.buildpacks.stack.homepage \ 
+LABEL io.buildpacks.stack.homepage \
   "https://github.com/GoogleCloudPlatform/buildpacks/stacks/google-min-22"
 
 # Set $PORT to 8080 by default
diff --git a/stacks/google_min_22/run_structure_test.yaml b/stacks/google_min_22/run_structure_test.yaml
index cc9b402bd..a392919c1 100644
--- a/stacks/google_min_22/run_structure_test.yaml
+++ b/stacks/google_min_22/run_structure_test.yaml
@@ -26,14 +26,14 @@ metadataTest:
     - key: PORT
       value: 8080
     - key: 'CNB_STACK_ID'
-      value: 'google.min.22'
+      value: 'google.gae.22'
     - key: 'CNB_USER_ID'
       value: '1000'
     - key: 'CNB_GROUP_ID'
       value: '1000'
   labels:
     - key: 'io.buildpacks.stack.id'
-      value: 'google.min.22'
+      value: 'google.gae.22'
     - key: 'io.buildpacks.stack.distro.name'
       value: 'Ubuntu'
     - key: 'io.buildpacks.stack.distro.version'