From 2a4cfa0ddd1061ebe01afe50bc062315b19e6a22 Mon Sep 17 00:00:00 2001 From: Chanseok Oh Date: Wed, 30 Oct 2019 13:28:03 -0400 Subject: [PATCH] Fix image repository inconsistencies --- BUILD | 80 ++++++++++++++++++++++++++++++++++++++---------------- java/BUILD | 14 ++-------- 2 files changed, 58 insertions(+), 36 deletions(-) diff --git a/BUILD b/BUILD index d4cd3c319..11f5d8bb8 100644 --- a/BUILD +++ b/BUILD @@ -5,30 +5,62 @@ load("@io_bazel_rules_docker//container:container.bzl", "container_bundle") container_bundle( name = "all", images = { - "gcr.io/{PROJECT_ID}/base:debug": "//base:debug", - "gcr.io/{PROJECT_ID}/base:debug-debian10": "//base:debug_debian10", - "gcr.io/{PROJECT_ID}/base:debug-nonroot": "//base:debug-nonroot", - "gcr.io/{PROJECT_ID}/base:debug-nonroot-debian10": "//base:debug-nonroot_debian10", - "gcr.io/{PROJECT_ID}/base:latest": "//base:base", - "gcr.io/{PROJECT_ID}/base:nonroot": "//base:base-nonroot", - "gcr.io/{PROJECT_ID}/base:nonroot-debian10": "//base:base-nonroot_debian10", - "gcr.io/{PROJECT_ID}/static:debian10": "//base:static_debian10", - "gcr.io/{PROJECT_ID}/static:latest": "//base:static", - "gcr.io/{PROJECT_ID}/static:nonroot": "//base:static-nonroot", - "gcr.io/{PROJECT_ID}/static:nonroot-debian10": "//base:static-nonroot_debian10", - "gcr.io/{PROJECT_ID}/cc:debug": "//cc:debug", - "gcr.io/{PROJECT_ID}/java:latest": "//java:java8", - "gcr.io/{PROJECT_ID}/java:8": "//java:java8", - "gcr.io/{PROJECT_ID}/java:debug": "//java:java8_debug", - "gcr.io/{PROJECT_ID}/java:8-debug": "//java:java8_debug", - "gcr.io/{PROJECT_ID}/java:11": "//java:java11", - "gcr.io/{PROJECT_ID}/java:11-debug": "//java:java11_debug", - "gcr.io/{PROJECT_ID}/java/jetty:latest": "//java/jetty:jetty_java8", - "gcr.io/{PROJECT_ID}/java/jetty:java8": "//java/jetty:jetty_java8", - "gcr.io/{PROJECT_ID}/java/jetty:debug": "//java/jetty:jetty_java8_debug", - "gcr.io/{PROJECT_ID}/java/jetty:java8-debug": "//java/jetty:jetty_java8_debug", - "gcr.io/{PROJECT_ID}/java/jetty:java11": "//java/jetty:jetty_java11", - "gcr.io/{PROJECT_ID}/java/jetty:java11-debug": "//java/jetty:jetty_java11_debug", + "gcr.io/{PROJECT_ID}/base:latest": "//base:base_debian9", + "gcr.io/{PROJECT_ID}/base:nonroot": "//base:base-nonroot_debian9", + "gcr.io/{PROJECT_ID}/base:debug": "//base:debug_debian9", + "gcr.io/{PROJECT_ID}/base:debug-nonroot": "//base:debug-nonroot_debian9", + "gcr.io/{PROJECT_ID}/base-debian9:latest": "//base:base_debian9", + "gcr.io/{PROJECT_ID}/base-debian9:nonroot": "//base:base-nonroot_debian9", + "gcr.io/{PROJECT_ID}/base-debian9:debug": "//base:debug_debian9", + "gcr.io/{PROJECT_ID}/base-debian9:debug-nonroot": "//base:debug-nonroot_debian9", + "gcr.io/{PROJECT_ID}/base-debian10:latest": "//base:base_debian10", + "gcr.io/{PROJECT_ID}/base-debian10:nonroot": "//base:base-nonroot_debian10", + "gcr.io/{PROJECT_ID}/base-debian10:debug": "//base:debug_debian10", + "gcr.io/{PROJECT_ID}/base-debian10:debug-nonroot": "//base:debug-nonroot_debian10", + "gcr.io/{PROJECT_ID}/static:latest": "//base:static_debian9", + "gcr.io/{PROJECT_ID}/static:nonroot": "//base:static-nonroot_debian9", + "gcr.io/{PROJECT_ID}/static-debian9:latest": "//base:static_debian9", + "gcr.io/{PROJECT_ID}/static-debian9:nonroot": "//base:static-nonroot_debian9", + "gcr.io/{PROJECT_ID}/static-debian10:latest": "//base:static_debian10", + "gcr.io/{PROJECT_ID}/static-debian10:nonroot": "//base:static-nonroot_debian10", + "gcr.io/{PROJECT_ID}/cc:latest": "//cc:cc_debian9", + "gcr.io/{PROJECT_ID}/cc:debug": "//cc:debug_debian9", + "gcr.io/{PROJECT_ID}/cc-debian9:latest": "//cc:cc_debian9", + "gcr.io/{PROJECT_ID}/cc-debian9:debug": "//cc:debug_debian9", + "gcr.io/{PROJECT_ID}/cc-debian10:latest": "//cc:cc_debian10", + "gcr.io/{PROJECT_ID}/cc-debian10:debug": "//cc:debug_debian10", + "gcr.io/{PROJECT_ID}/java:latest": "//java:java8_debian9", + "gcr.io/{PROJECT_ID}/java:8": "//java:java8_debian9", + "gcr.io/{PROJECT_ID}/java:debug": "//java:java8_debug_debian9", + "gcr.io/{PROJECT_ID}/java:8-debug": "//java:java8_debug_debian9", + "gcr.io/{PROJECT_ID}/java:11": "//java:java11_debian9", + "gcr.io/{PROJECT_ID}/java:11-debug": "//java:java11_debug_debian9", + "gcr.io/{PROJECT_ID}/java-debian9:latest": "//java:java8_debian9", + "gcr.io/{PROJECT_ID}/java-debian9:8": "//java:java8_debian9", + "gcr.io/{PROJECT_ID}/java-debian9:debug": "//java:java8_debug_debian9", + "gcr.io/{PROJECT_ID}/java-debian9:8-debug": "//java:java8_debug_debian9", + "gcr.io/{PROJECT_ID}/java-debian9:11": "//java:java11_debian9", + "gcr.io/{PROJECT_ID}/java-debian9:11-debug": "//java:java11_debug_debian9", + "gcr.io/{PROJECT_ID}/java-debian10:latest": "//java:java11_debian10", + "gcr.io/{PROJECT_ID}/java-debian10:11": "//java:java11_debian10", + "gcr.io/{PROJECT_ID}/java-debian10:debug": "//java:java11_debug_debian10", + "gcr.io/{PROJECT_ID}/java-debian10:11-debug": "//java:java11_debug_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-debian9/jetty:latest": "//java/jetty:jetty_java8_debian9", + "gcr.io/{PROJECT_ID}/java-debian9/jetty:java8": "//java/jetty:jetty_java8_debian9", + "gcr.io/{PROJECT_ID}/java-debian9/jetty:debug": "//java/jetty:jetty_java8_debug_debian9", + "gcr.io/{PROJECT_ID}/java-debian9/jetty:java8-debug": "//java/jetty:jetty_java8_debug_debian9", + "gcr.io/{PROJECT_ID}/java-debian9/jetty:java11": "//java/jetty:jetty_java11_debian9", + "gcr.io/{PROJECT_ID}/java-debian9/jetty:java11-debug": "//java/jetty:jetty_java11_debug_debian9", + "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", + "gcr.io/{PROJECT_ID}/java-debian10/jetty:java11-debug": "//java/jetty:jetty_java11_debug_debian10", "gcr.io/{PROJECT_ID}/python3:latest": "//experimental/python3:python3", "gcr.io/{PROJECT_ID}/python3:debug": "//experimental/python3:debug", "gcr.io/{PROJECT_ID}/python2.7:latest": "//experimental/python2.7:python27", diff --git a/java/BUILD b/java/BUILD index 43a464a9e..42bd8c360 100644 --- a/java/BUILD +++ b/java/BUILD @@ -53,18 +53,8 @@ cacerts_java( }, tars = [":cacerts_java"], ) for (distro_suffix, rule_name, jre_deb, 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", - "/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java", - ), + ("_debian9", "java8", "openjdk-8-jre-headless", "/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java"), + ("_debian9", "java8_debug", "openjdk-8-jre-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", "/usr/lib/jvm/java-11-openjdk-amd64/bin/java"), ("_debian10", "java11", "openjdk-11-jre-headless", "/usr/lib/jvm/java-11-openjdk-amd64/bin/java"),