Add gcc-12-base for common gcc/c++ lib info

Signed-off-by: Appu Goundan <appu@google.com>
GoogleContainerTools · Feb 12, 2025 · 2569609 · 2569609
1 parent 2c238bf
commit 2569609
Show file tree

Hide file tree

Showing 9 changed files with 578 additions and 394 deletions.
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/cc/BUILD b/cc/BUILD
@@ -30,6 +30,7 @@ package(default_visibility = ["//visibility:public"])
         name = ("cc" if (not mode) else mode[1:]) + "_" + user + "_" + arch + "_" + distro,
         base = "//base" + (mode if mode else ":base") + "_" + user + "_" + arch + "_" + distro,
         tars = [
+            deb.package(arch, distro, "gcc-12-base"),
             deb.package(arch, distro, "libgomp1"),
             deb.package(arch, distro, "libstdc++6"),
             deb.package(arch, distro, "libgcc-s1"),

diff --git a/java/BUILD b/java/BUILD
@@ -128,6 +128,7 @@ JAVA_VERSIONS_PER_DISTRO = [
             deb.package(arch, distro, "libuuid1"),
             deb.package(arch, distro, "libbrotli1"),
             deb.package(arch, distro, "libcrypt1"),
+            deb.package(arch, distro, "gcc-12-base"),
             deb.package(arch, distro, "libstdc++6"),
             deb.package(arch, distro, "libgcc-s1"),
             "//common:locale_" + distro + "_" + arch,

diff --git a/private/repos/deb/bookworm.lock.json b/private/repos/deb/bookworm.lock.json
diff --git a/private/repos/deb/bookworm.yaml b/private/repos/deb/bookworm.yaml
@@ -3,11 +3,11 @@ version: 1
 
 sources:
   - channel: bookworm main
-    url: https://snapshot.debian.org/archive/debian/20250203T205752Z
+    url: https://snapshot.debian.org/archive/debian/20250211T205324Z
   - channel: bookworm-updates main
-    url: https://snapshot.debian.org/archive/debian/20250203T205752Z
+    url: https://snapshot.debian.org/archive/debian/20250211T205324Z
   - channel: bookworm-security main
-    url: https://snapshot.debian.org/archive/debian-security/20250203T205752Z
+    url: https://snapshot.debian.org/archive/debian-security/20250211T205324Z
 
 archs:
   - amd64
@@ -26,6 +26,7 @@ packages:
   - openssl
   - tzdata
   # c++
+  - gcc-12-base
   - libgcc-s1
   - libgomp1
   - libstdc++6
diff --git a/private/repos/deb/bookworm_java.lock.json b/private/repos/deb/bookworm_java.lock.json
diff --git a/private/repos/deb/bookworm_java.yaml b/private/repos/deb/bookworm_java.yaml
@@ -3,11 +3,11 @@ version: 1
 
 sources:
   - channel: bookworm main
-    url: https://snapshot.debian.org/archive/debian/20250203T205752Z
+    url: https://snapshot.debian.org/archive/debian/20250211T205324Z
   - channel: bookworm-updates main
-    url: https://snapshot.debian.org/archive/debian/20250203T205752Z
+    url: https://snapshot.debian.org/archive/debian/20250211T205324Z
   - channel: bookworm-security main
-    url: https://snapshot.debian.org/archive/debian-security/20250203T205752Z
+    url: https://snapshot.debian.org/archive/debian-security/20250211T205324Z
 
 archs:
   - amd64
@@ -34,6 +34,7 @@ packages:
   - openjdk-17-jdk-headless
   - openjdk-17-jre-headless
   - zlib1g
-  # TODO(appu): these two were coming from base yamls
+  # java image builds off base (not cc)
+  - gcc-12-base
   - libgcc-s1
   - libstdc++6
diff --git a/private/repos/deb/bookworm_python.lock.json b/private/repos/deb/bookworm_python.lock.json
diff --git a/private/repos/deb/bookworm_python.yaml b/private/repos/deb/bookworm_python.yaml
@@ -3,11 +3,11 @@ version: 1
 
 sources:
   - channel: bookworm main
-    url: https://snapshot.debian.org/archive/debian/20250203T205752Z
+    url: https://snapshot.debian.org/archive/debian/20250211T205324Z
   - channel: bookworm-updates main
-    url: https://snapshot.debian.org/archive/debian/20250203T205752Z
+    url: https://snapshot.debian.org/archive/debian/20250211T205324Z
   - channel: bookworm-security main
-    url: https://snapshot.debian.org/archive/debian-security/20250203T205752Z
+    url: https://snapshot.debian.org/archive/debian-security/20250211T205324Z
 
 archs:
   - amd64