Delete google-min-22 builder.

PiperOrigin-RevId: 683918932 Change-Id: I582da292d834d12c70be0295d8b07148bec5de4b
GoogleCloudPlatform · Oct 9, 2024 · a8217b8 · a8217b8
1 parent 637d330
commit a8217b8
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 255 deletions.
diff --git a/builders/gcp/base/BUILD.bazel b/builders/gcp/base/BUILD.bazel
@@ -160,52 +160,3 @@ builder(
     },
     image = "google-22/builder",
 )
-
-builder(
-    name = "min_22_builder",
-    buildpacks = [
-        "//cmd/config/entrypoint:entrypoint.tgz",
-        "//cmd/utils/label:label_image.tgz",
-    ],
-    descriptor = "google.min.22.builder.toml",
-    groups = {
-        "dart": [
-            "//cmd/dart/compile:compile.tgz",
-            "//cmd/dart/pub:pub.tgz",
-            "//cmd/dart/sdk:sdk.tgz",
-        ],
-        "dotnet": [
-            "//cmd/dotnet/functions_framework:functions_framework.tgz",
-            "//cmd/dotnet/publish:publish.tgz",
-            "//cmd/dotnet/runtime:runtime.tgz",
-            "//cmd/dotnet/sdk:sdk.tgz",
-        ],
-        "go": [
-            "//cmd/go/build:build.tgz",
-            "//cmd/go/clear_source:clear_source.tgz",
-            "//cmd/go/functions_framework:functions_framework.tgz",
-            "//cmd/go/gomod:gomod.tgz",
-            "//cmd/go/gopath:gopath.tgz",
-            "//cmd/go/runtime:runtime.tgz",
-        ],
-        "java": [
-            "//cmd/java/clear_source:clear_source.tgz",
-            "//cmd/java/entrypoint:entrypoint.tgz",
-            "//cmd/java/exploded_jar:exploded_jar.tgz",
-            "//cmd/java/functions_framework:functions_framework.tgz",
-            "//cmd/java/gradle:gradle.tgz",
-            "//cmd/java/maven:maven.tgz",
-            "//cmd/java/runtime:runtime.tgz",
-            "//cmd/java/graalvm:graalvm.tgz",
-            "//cmd/java/native_image:native_image.tgz",
-        ],
-        "nodejs": [
-            "//cmd/nodejs/functions_framework:functions_framework.tgz",
-            "//cmd/nodejs/npm:npm.tgz",
-            "//cmd/nodejs/runtime:runtime.tgz",
-            "//cmd/nodejs/yarn:yarn.tgz",
-            "//cmd/nodejs/pnpm:pnpm.tgz",
-        ],
-    },
-    image = "google-min-22/builder",
-)
diff --git a/builders/gcp/base/google.min.22.builder.toml b/builders/gcp/base/google.min.22.builder.toml
@@ -485,7 +485,7 @@ description = "Ubuntu 18 base image with buildpacks for .NET, Go, Java, Node.js,
 
 [stack]
   id = "google.gae.22"
-  build-image = "gcr.io/gae-runtimes/buildpacks/stacks/google-min-22/build"
+  build-image = "gcr.io/gae-runtimes/buildpacks/stacks/google-gae-22/build"
   run-image = "gcr.io/gae-runtimes/buildpacks/stacks/google-min-22/run"
 
 [lifecycle]

diff --git a/stacks/google_min_22/BUILD.bazel b/stacks/google_min_22/BUILD.bazel
@@ -1,9 +1,6 @@
 licenses(["notice"])
 
 exports_files([
-    "build-packages.txt",
-    "build.Dockerfile",
-    "build_structure_test.yaml",
     "run-packages.txt",
     "run.Dockerfile",
     "run_structure_test.yaml",

diff --git a/stacks/google_min_22/README.md b/stacks/google_min_22/README.md
@@ -15,27 +15,13 @@ Installed Packages:
 
 ## Build Image
 
-[gcr.io/gae-runtimes/buildpacks/stacks/google-min-22/build](https://gcr.io/gae-runtimes/buildpacks/stacks/google-min-22/build)
-
-Installed Packages:
-
-* `build-essential`
-* `ca-certificates`
-* `curl`
-* `git`
-* `locales`
-* `openssl`
-* `tar`
-* `tzdata`
-* `unzip`
-* `xz-utils`
-* `zip`
+[gcr.io/gae-runtimes/buildpacks/stacks/google-gae-22/build](https://gcr.io/gae-runtimes/buildpacks/stacks/google-gae-22/build)
 
 ## Building Images
 
-Both the `run.Dockerfile` and `build.Dockerfile` image require `CANDIDATE_NAME`
-as a `build-arg`. This is unique identifier used to track releases, but any
-string can be provided for local development.
+The `run.Dockerfile` image require `CANDIDATE_NAME` as a `build-arg`. This is
+unique identifier used to track releases, but any string can be provided for
+local development.
 
 To build the run image:
 
@@ -46,15 +32,6 @@ DOCKER_BUILDKIT=1 docker build . \
   --tag gcr.io/gae-runtimes/buildpacks/stacks/google-min-22/run
 ```
 
-To build the build image:
-
-```
-DOCKER_BUILDKIT=1 docker build . \
-  --build-arg CANDIDATE_NAME=test \
-  --file build.Dockerfile \
-  --tag gcr.io/gae-runtimes/buildpacks/stacks/google-min-22/build
-```
-
 ## Run Tests
 
 We use [container structure tests](https://github.com/GoogleContainerTools/container-structure-test)
@@ -67,11 +44,3 @@ container-structure-test test \
   --image gcr.io/gae-runtimes/buildpacks/stacks/google-min-22/run \
   --config run_structure_test.yaml
 ```
-
-To test the build image:
-
-```
-container-structure-test test \
-  --image gcr.io/gae-runtimes/buildpacks/stacks/google-min-22/build \
-  --config build_structure_test.yaml
-```
diff --git a/stacks/google_min_22/build-packages.txt b/stacks/google_min_22/build-packages.txt
diff --git a/stacks/google_min_22/build.Dockerfile b/stacks/google_min_22/build.Dockerfile
diff --git a/stacks/google_min_22/build_structure_test.yaml b/stacks/google_min_22/build_structure_test.yaml
diff --git a/tools/cloudbuild/create_stacks.yaml b/tools/cloudbuild/create_stacks.yaml
@@ -20,17 +20,6 @@
 #   $ gcloud builds submit --config=tools/cloudbuild/create_stacks.yaml \
 #      --substitutions _CANDIDATE_NAME=my-local-build
 steps:
-  - id: min-build-image
-    name: gcr.io/cloud-builders/docker
-    dir: stacks/google_min_22
-    args:
-    - 'build'
-    - '--build-arg="packages=build-packages.txt"'
-    - '--build-arg="CANDIDATE_NAME=${_CANDIDATE_NAME}"'
-    - '-t=gcr.io/$PROJECT_ID/stacks/google-min-22/build:latest'
-    - '.'
-    waitFor: ['-']
-
   - id: min-run-image
     name: gcr.io/cloud-builders/docker
     dir: stacks/google_min_22
@@ -65,7 +54,6 @@ steps:
     waitFor: ['-']
 
 images:
-  - 'gcr.io/$PROJECT_ID/stacks/google-min-22/build:latest'
   - 'gcr.io/$PROJECT_ID/stacks/google-min-22/run:latest'
   - 'gcr.io/$PROJECT_ID/stacks/google-gae-22/build:latest'
   - 'gcr.io/$PROJECT_ID/stacks/google-gae-22/run:latest'