Remove more debian9 references. (GoogleContainerTools#712)

* Remove more debian9 references. Signed-off-by: Dan Lorenc <[email protected]> * Comment out java for now so we don't accidentally switch the OS.
mrpeppermintkg · Apr 5, 2021 · 1b41e6a · 1b41e6a
1 parent 9710dc4
commit 1b41e6a
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 258 deletions.
diff --git a/BUILD b/BUILD
@@ -129,18 +129,18 @@ PYTHON27.update({
 })
 
 NODEJS = {
-    "gcr.io/{PROJECT_ID}/nodejs:latest-amd64": "//nodejs:nodejs14_amd64_debian9",
-    "gcr.io/{PROJECT_ID}/nodejs:latest-arm64": "//nodejs:nodejs14_arm64_debian9",
-    "gcr.io/{PROJECT_ID}/nodejs:debug-amd64": "//nodejs:nodejs14_debug_amd64_debian9",
-    "gcr.io/{PROJECT_ID}/nodejs:debug-arm64": "//nodejs:nodejs14_debug_arm64_debian9",
+    "gcr.io/{PROJECT_ID}/nodejs:latest-amd64": "//nodejs:nodejs14_amd64_debian10",
+    "gcr.io/{PROJECT_ID}/nodejs:latest-arm64": "//nodejs:nodejs14_arm64_debian10",
+    "gcr.io/{PROJECT_ID}/nodejs:debug-amd64": "//nodejs:nodejs14_debug_amd64_debian10",
+    "gcr.io/{PROJECT_ID}/nodejs:debug-arm64": "//nodejs:nodejs14_debug_arm64_debian10",
     "gcr.io/{PROJECT_ID}/nodejs-debian10:latest": "//nodejs:nodejs14_amd64_debian10",
     "gcr.io/{PROJECT_ID}/nodejs-debian10:debug": "//nodejs:nodejs14_debug_amd64_debian10",
-    "gcr.io/{PROJECT_ID}/nodejs:10": "//nodejs:nodejs10_amd64_debian9",
-    "gcr.io/{PROJECT_ID}/nodejs:12": "//nodejs:nodejs12_amd64_debian9",
-    "gcr.io/{PROJECT_ID}/nodejs:14": "//nodejs:nodejs14_amd64_debian9",
-    "gcr.io/{PROJECT_ID}/nodejs:10-debug": "//nodejs:nodejs10_debug_amd64_debian9",
-    "gcr.io/{PROJECT_ID}/nodejs:12-debug": "//nodejs:nodejs12_debug_amd64_debian9",
-    "gcr.io/{PROJECT_ID}/nodejs:14-debug": "//nodejs:nodejs14_debug_amd64_debian9",
+    "gcr.io/{PROJECT_ID}/nodejs:10": "//nodejs:nodejs10_amd64_debian10",
+    "gcr.io/{PROJECT_ID}/nodejs:12": "//nodejs:nodejs12_amd64_debian10",
+    "gcr.io/{PROJECT_ID}/nodejs:14": "//nodejs:nodejs14_amd64_debian10",
+    "gcr.io/{PROJECT_ID}/nodejs:10-debug": "//nodejs:nodejs10_debug_amd64_debian10",
+    "gcr.io/{PROJECT_ID}/nodejs:12-debug": "//nodejs:nodejs12_debug_amd64_debian10",
+    "gcr.io/{PROJECT_ID}/nodejs:14-debug": "//nodejs:nodejs14_debug_amd64_debian10",
     "gcr.io/{PROJECT_ID}/nodejs-debian10:10": "//nodejs:nodejs10_amd64_debian10",
     "gcr.io/{PROJECT_ID}/nodejs-debian10:12": "//nodejs:nodejs12_amd64_debian10",
     "gcr.io/{PROJECT_ID}/nodejs-debian10:14": "//nodejs:nodejs14_amd64_debian10",
@@ -150,22 +150,18 @@ NODEJS = {
 }
 
 JAVA = {
-    "gcr.io/{PROJECT_ID}/java:base": "//java:java_base_root_debian9",
-    "gcr.io/{PROJECT_ID}/java:base-nonroot": "//java:java_base_nonroot_debian9",
-    "gcr.io/{PROJECT_ID}/java:base-debug": "//java:java_base_debug_root_debian9",
-    "gcr.io/{PROJECT_ID}/java:base-debug-nonroot": "//java:java_base_debug_nonroot_debian9",
-    "gcr.io/{PROJECT_ID}/java:latest": "//java:java8_root_debian9",
-    "gcr.io/{PROJECT_ID}/java:nonroot": "//java:java8_nonroot_debian9",
-    "gcr.io/{PROJECT_ID}/java:8": "//java:java8_root_debian9",
-    "gcr.io/{PROJECT_ID}/java:8-nonroot": "//java:java8_nonroot_debian9",
-    "gcr.io/{PROJECT_ID}/java:debug": "//java:java8_debug_root_debian9",
-    "gcr.io/{PROJECT_ID}/java:debug-nonroot": "//java:java8_debug_nonroot_debian9",
-    "gcr.io/{PROJECT_ID}/java:8-debug": "//java:java8_debug_root_debian9",
-    "gcr.io/{PROJECT_ID}/java:8-debug-nonroot": "//java:java8_debug_nonroot_debian9",
-    "gcr.io/{PROJECT_ID}/java:11": "//java:java11_root_debian9",
-    "gcr.io/{PROJECT_ID}/java:11-nonroot": "//java:java11_nonroot_debian9",
-    "gcr.io/{PROJECT_ID}/java:11-debug": "//java:java11_debug_root_debian9",
-    "gcr.io/{PROJECT_ID}/java:11-debug-nonroot": "//java:java11_debug_nonroot_debian9",
+    "gcr.io/{PROJECT_ID}/java:base": "//java:java_base_root_debian10",
+    "gcr.io/{PROJECT_ID}/java:base-nonroot": "//java:java_base_nonroot_debian10",
+    "gcr.io/{PROJECT_ID}/java:base-debug": "//java:java_base_debug_root_debian10",
+    "gcr.io/{PROJECT_ID}/java:base-debug-nonroot": "//java:java_base_debug_nonroot_debian10",
+    "gcr.io/{PROJECT_ID}/java:latest": "//java:java11_root_debian10",
+    "gcr.io/{PROJECT_ID}/java:nonroot": "//java:java11_nonroot_debian10",
+    "gcr.io/{PROJECT_ID}/java:debug": "//java:java11_debug_root_debian10",
+    "gcr.io/{PROJECT_ID}/java:debug-nonroot": "//java:java11_debug_nonroot_debian10",
+    "gcr.io/{PROJECT_ID}/java:11": "//java:java11_root_debian10",
+    "gcr.io/{PROJECT_ID}/java:11-nonroot": "//java:java11_nonroot_debian10",
+    "gcr.io/{PROJECT_ID}/java:11-debug": "//java:java11_debug_root_debian10",
+    "gcr.io/{PROJECT_ID}/java:11-debug-nonroot": "//java:java11_debug_nonroot_debian10",
     "gcr.io/{PROJECT_ID}/java-debian10:base": "//java:java_base_root_debian10",
     "gcr.io/{PROJECT_ID}/java-debian10:base-nonroot": "//java:java_base_nonroot_debian10",
     "gcr.io/{PROJECT_ID}/java-debian10:base-debug": "//java:java_base_debug_root_debian10",
@@ -178,12 +174,10 @@ JAVA = {
     "gcr.io/{PROJECT_ID}/java-debian10:debug-nonroot": "//java:java11_debug_nonroot_debian10",
     "gcr.io/{PROJECT_ID}/java-debian10:11-debug": "//java:java11_debug_root_debian10",
     "gcr.io/{PROJECT_ID}/java-debian10:11-debug-nonroot": "//java:java11_debug_nonroot_debian10",
-    "gcr.io/{PROJECT_ID}/java/jetty:latest": "//java/jetty:jetty_java8_debian9",
-    "gcr.io/{PROJECT_ID}/java/jetty:java8": "//java/jetty:jetty_java8_debian9",
-    "gcr.io/{PROJECT_ID}/java/jetty:debug": "//java/jetty:jetty_java8_debug_debian9",
-    "gcr.io/{PROJECT_ID}/java/jetty:java8-debug": "//java/jetty:jetty_java8_debug_debian9",
-    "gcr.io/{PROJECT_ID}/java/jetty:java11": "//java/jetty:jetty_java11_debian9",
-    "gcr.io/{PROJECT_ID}/java/jetty:java11-debug": "//java/jetty:jetty_java11_debug_debian9",
+    "gcr.io/{PROJECT_ID}/java/jetty:latest": "//java/jetty:jetty_java11_debian10",
+    "gcr.io/{PROJECT_ID}/java/jetty:debug": "//java/jetty:jetty_java11_debug_debian10",
+    "gcr.io/{PROJECT_ID}/java/jetty:java11": "//java/jetty:jetty_java11_debian10",
+    "gcr.io/{PROJECT_ID}/java/jetty:java11-debug": "//java/jetty:jetty_java11_debug_debian10",
     "gcr.io/{PROJECT_ID}/java-debian10/jetty:latest": "//java/jetty:jetty_java11_debian10",
     "gcr.io/{PROJECT_ID}/java-debian10/jetty:java11": "//java/jetty:jetty_java11_debian10",
     "gcr.io/{PROJECT_ID}/java-debian10/jetty:debug": "//java/jetty:jetty_java11_debug_debian10",
@@ -204,7 +198,7 @@ ALL.update(PYTHON27)
 
 ALL.update(NODEJS)
 
-ALL.update(JAVA)
+# ALL.update(JAVA)
 
 container_bundle(
     name = "all",

diff --git a/WORKSPACE b/WORKSPACE
@@ -81,73 +81,6 @@ load(
     if "backports" in SHA256s[arch][name]
 ]
 
-[
-    dpkg_list(
-        name = "package_bundle_" + arch + "_debian9",
-        packages = [
-            "libc6",
-            "base-files",
-            "ca-certificates",
-            "openssl",
-            "libssl1.0.2",
-            "libssl1.1",
-            "libbz2-1.0",
-            "libdb5.3",
-            "libffi6",
-            "libncursesw5",
-            "liblzma5",
-            "libexpat1",
-            "libreadline7",
-            "libtinfo5",
-            "libsqlite3-0",
-            "mime-support",
-            "netbase",
-            "readline-common",
-            "tzdata",
-
-            #c++
-            "libgcc1",
-            "libgomp1",
-            "libstdc++6",
-
-            #java
-            "zlib1g",
-            "libjpeg62-turbo",
-            "libpng16-16",
-            "liblcms2-2",
-            "libfreetype6",
-            "fonts-dejavu-core",
-            "fontconfig-config",
-            "libfontconfig1",
-            "libuuid1",
-            "openjdk-8-jre-headless",
-            "openjdk-8-jdk-headless",
-            "openjdk-11-jre-headless",
-            "openjdk-11-jdk-headless",
-            "libc-bin",
-
-            #python
-            "libpython2.7-minimal",
-            "python2.7-minimal",
-            "libpython2.7-stdlib",
-            "dash",
-            "libc-bin",
-
-            #python3
-            "libmpdec2",
-            "libpython3.5-minimal",
-            "libpython3.5-stdlib",
-            "python3.5-minimal",
-        ] + (["libunwind8"] if arch in BASE_ARCHITECTURES else []),
-        sources = [
-            "@" + arch + "_debian9_updates//file:Packages.json",
-            "@" + arch + "_debian9_backports//file:Packages.json",
-            "@" + arch + "_debian9//file:Packages.json",
-        ] + (["@" + arch + "_debian9_security//file:Packages.json"] if arch in BASE_ARCHITECTURES else []),
-    )
-    for arch in ARCHITECTURES
-]
-
 [
     dpkg_list(
         name = "package_bundle_" + arch + "_debian10",

diff --git a/base/distro.bzl b/base/distro.bzl
@@ -1,58 +1,43 @@
-load("@package_bundle_amd64_debian9//file:packages.bzl", packages_amd64_debian9 = "packages")
 load("@package_bundle_amd64_debian10//file:packages.bzl", packages_amd64_debian10 = "packages")
-load("@package_bundle_arm_debian9//file:packages.bzl", packages_arm_debian9 = "packages")
 load("@package_bundle_arm_debian10//file:packages.bzl", packages_arm_debian10 = "packages")
-load("@package_bundle_arm64_debian9//file:packages.bzl", packages_arm64_debian9 = "packages")
 load("@package_bundle_arm64_debian10//file:packages.bzl", packages_arm64_debian10 = "packages")
-load("@package_bundle_s390x_debian9//file:packages.bzl", packages_s390x_debian9 = "packages")
 load("@package_bundle_s390x_debian10//file:packages.bzl", packages_s390x_debian10 = "packages")
-load("@package_bundle_ppc64le_debian9//file:packages.bzl", packages_ppc64le_debian9 = "packages")
 load("@package_bundle_ppc64le_debian10//file:packages.bzl", packages_ppc64le_debian10 = "packages")
 
-DISTRO_SUFFIXES = ("_debian9", "_debian10")
+DISTRO_SUFFIXES = ["_debian10"]
 
 DISTRO_PACKAGES = {
     "amd64": {
-        "_debian9": packages_amd64_debian9,
         "_debian10": packages_amd64_debian10,
     },
     "arm": {
-        "_debian9": packages_arm_debian9,
         "_debian10": packages_arm_debian10,
     },
     "arm64": {
-        "_debian9": packages_arm64_debian9,
         "_debian10": packages_arm64_debian10,
     },
     "s390x": {
-        "_debian9": packages_s390x_debian9,
         "_debian10": packages_s390x_debian10,
     },
     "ppc64le": {
-        "_debian9": packages_ppc64le_debian9,
         "_debian10": packages_ppc64le_debian10,
     },
 }
 
 DISTRO_REPOSITORY = {
     "amd64": {
-        "_debian9": "@amd64_debian9",
         "_debian10": "@amd64_debian10",
     },
     "arm": {
-        "_debian9": "@arm_debian9",
         "_debian10": "@arm_debian10",
     },
     "arm64": {
-        "_debian9": "@arm64_debian9",
         "_debian10": "@arm64_debian10",
     },
     "s390x": {
-        "_debian9": "@s390x_debian9",
         "_debian10": "@s390x_debian10",
     },
     "ppc64le": {
-        "_debian9": "@ppc64le_debian9",
         "_debian10": "@ppc64le_debian10",
     },
 }
diff --git a/checksums.bzl b/checksums.bzl
@@ -17,7 +17,7 @@ VERSIONS = [
     ("debian10", "buster"),
 ]
 
-DEBIAN_SNAPSHOT = "20210404T144123Z"
+DEBIAN_SNAPSHOT = "20210404T202957Z"
 
 DEBIAN_SECURITY_SNAPSHOT = "20210404T121356Z"
 

diff --git a/java/BUILD b/java/BUILD
@@ -4,13 +4,11 @@ load("//base:distro.bzl", "DISTRO_PACKAGES", "DISTRO_SUFFIXES")
 load("@io_bazel_rules_docker//container:container.bzl", "container_image")
 load("@io_bazel_rules_docker//contrib:test.bzl", "container_test")
 load("@io_bazel_rules_docker//java:image.bzl", "java_image")
-load("@package_bundle_amd64_debian9//file:packages.bzl", versions_amd64_debian9 = "versions")
 load("@package_bundle_amd64_debian10//file:packages.bzl", versions_amd64_debian10 = "versions")
 load("//cacerts:java.bzl", "cacerts_java")
 load("//java:jre_ver.bzl", "jre_ver")
 
 DISTRO_VERSIONS = {
-    "_debian9": versions_amd64_debian9,
     "_debian10": versions_amd64_debian10,
 }
 
@@ -64,36 +62,6 @@ USERS = [
         symlinks = {"/usr/bin/java": java_executable_path},
     )
     for (distro_suffix, rule_name, java_debs, java_executable_path) in [
-        (
-            "_debian9",
-            "java8",
-            ["openjdk-8-jre-headless"],
-            "/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java",
-        ),
-        (
-            "_debian9",
-            "java8_debug",
-            [
-                "openjdk-8-jre-headless",
-                "openjdk-8-jdk-headless",
-            ],
-            "/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java",
-        ),
-        (
-            "_debian9",
-            "java11",
-            ["openjdk-11-jre-headless"],
-            "/usr/lib/jvm/java-11-openjdk-amd64/bin/java",
-        ),
-        (
-            "_debian9",
-            "java11_debug",
-            [
-                "openjdk-11-jre-headless",
-                "openjdk-11-jdk-headless",
-            ],
-            "/usr/lib/jvm/java-11-openjdk-amd64/bin/java",
-        ),
         (
             "_debian10",
             "java11",
@@ -131,32 +99,6 @@ USERS = [
     for distro_suffix in DISTRO_SUFFIXES
 ]
 
-[
-    container_test(
-        name = "java8_debian9_" + user + "_test",
-        configs = ["testdata/java8.yaml"],
-        image = ":java8_" + user + "_debian9",
-        tags = [
-            "amd64",
-            "manual",
-        ],
-    )
-    for user in USERS
-]
-
-[
-    container_test(
-        name = "java8_debug_" + user + "_debian9_test",
-        configs = ["testdata/java8_debug.yaml"],
-        image = ":java8_debug_" + user + "_debian9",
-        tags = [
-            "amd64",
-            "manual",
-        ],
-    )
-    for user in USERS
-]
-
 [
     container_test(
         name = "java11_" + user + distro_suffix + "_test",
@@ -186,10 +128,6 @@ USERS = [
 ]
 
 RULE_NAMES = [
-    "java8_root_debian9",
-    "java8_nonroot_debian9",
-    "java11_root_debian9",
-    "java11_nonroot_debian9",
     "java11_root_debian10",
     "java11_nonroot_debian10",
 ]

diff --git a/java/jetty/BUILD b/java/jetty/BUILD
@@ -13,10 +13,6 @@ load("@io_bazel_rules_docker//contrib:test.bzl", "container_test")
     workdir = "/jetty",
     # We expect users to add their WAR under /jetty/webapps.
 ) for (rule_name, base_image) in [
-    ("jetty_java8_debian9", "//java:java8_root_debian9"),
-    ("jetty_java8_debug_debian9", "//java:java8_debug_root_debian9"),
-    ("jetty_java11_debian9", "//java:java11_root_debian9"),
-    ("jetty_java11_debug_debian9", "//java:java11_debug_root_debian9"),
     ("jetty_java11_debian10", "//java:java11_root_debian10"),
     ("jetty_java11_debug_debian10", "//java:java11_debug_root_debian10"),
 ]]