Update docker-images to version 72

This also updates all centos7-oj11 based images to move to centos7-oj17 because of changes in trinodb/docker-images@d67aab3 which change the images to use the oj17 base.
trinodb · Nov 2, 2022 · 3755b94 · 3755b94
1 parent b1aac9f
commit 3755b94
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 11 deletions.
diff --git a/...ord-authenticators/src/test/java/io/trino/plugin/password/ldap/TestingOpenLdapServer.java b/...ord-authenticators/src/test/java/io/trino/plugin/password/ldap/TestingOpenLdapServer.java
@@ -54,7 +54,7 @@ public class TestingOpenLdapServer
 
     public TestingOpenLdapServer(Network network)
     {
-        openLdapServer = new GenericContainer<>("ghcr.io/trinodb/testing/centos7-oj11-openldap:" + TestingProperties.getDockerImagesVersion())
+        openLdapServer = new GenericContainer<>("ghcr.io/trinodb/testing/centos7-oj17-openldap:" + TestingProperties.getDockerImagesVersion())
                 .withNetwork(network)
                 .withExposedPorts(LDAP_PORT)
                 .withStartupCheckStrategy(new IsRunningStartupCheckStrategy())

diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,7 @@
         <dep.iceberg.version>1.0.0</dep.iceberg.version>
         <dep.spotbugs-annotations.version>4.7.2</dep.spotbugs-annotations.version>
 
-        <dep.docker.images.version>65</dep.docker.images.version>
+        <dep.docker.images.version>72</dep.docker.images.version>
 
         <!--
           America/Bahia_Banderas has:

diff --git a/...uct-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java b/...uct-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java
@@ -117,7 +117,7 @@ public void extendEnvironment(Environment.Builder builder)
     private DockerContainer createTrinoMaster()
     {
         DockerContainer container =
-                createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj11:" + imagesVersion, COORDINATOR)
+                createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj17:" + imagesVersion, COORDINATOR)
                         .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/standard/access-control.properties")), CONTAINER_TRINO_ACCESS_CONTROL_PROPERTIES)
                         .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/standard/config.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES);
 
@@ -128,7 +128,7 @@ private DockerContainer createTrinoMaster()
     @SuppressWarnings("resource")
     private DockerContainer createTestsContainer()
     {
-        DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/centos7-oj11:" + imagesVersion, TESTS)
+        DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/centos7-oj17:" + imagesVersion, TESTS)
                 .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath()), "/docker/presto-product-tests")
                 .withCommand("bash", "-xeuc", "echo 'No command provided' >&2; exit 69")
                 .waitingFor(new WaitAllStrategy()) // don't wait

diff --git a/...-launcher/src/main/java/io/trino/tests/product/launcher/env/common/StandardMultinode.java b/...-launcher/src/main/java/io/trino/tests/product/launcher/env/common/StandardMultinode.java
@@ -82,7 +82,7 @@ public void extendEnvironment(Environment.Builder builder)
     @SuppressWarnings("resource")
     private DockerContainer createTrinoWorker()
     {
-        return createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj11:" + imagesVersion, WORKER)
+        return createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj17:" + imagesVersion, WORKER)
                 .withCopyFileToContainer(forHostPath(configDir.getPath("multinode-worker-config.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES);
     }
 }
diff --git a/.../main/java/io/trino/tests/product/launcher/env/environment/AbstractEnvSinglenodeLdap.java b/.../main/java/io/trino/tests/product/launcher/env/environment/AbstractEnvSinglenodeLdap.java
@@ -86,7 +86,7 @@ public void extendEnvironment(Environment.Builder builder)
 
     protected String getBaseImage()
     {
-        return "centos7-oj11-openldap";
+        return "centos7-oj17-openldap";
     }
 
     protected abstract String getPasswordAuthenticatorConfigPath();

diff --git a/...rc/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeHiveCaching.java b/...rc/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeHiveCaching.java
@@ -90,7 +90,7 @@ public void extendEnvironment(Environment.Builder builder)
     @SuppressWarnings("resource")
     private void createTrinoWorker(Environment.Builder builder, int workerNumber)
     {
-        builder.addContainer(createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj11:" + imagesVersion, worker(workerNumber))
+        builder.addContainer(createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj17:" + imagesVersion, worker(workerNumber))
                 .withCopyFileToContainer(forHostPath(configDir.getPath("multinode/multinode-worker-jvm.config")), CONTAINER_TRINO_JVM_CONFIG)
                 .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/standard-multinode/multinode-worker-config.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES)
                 .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive.properties")), CONTAINER_TRINO_HIVE_NON_CACHED_PROPERTIES)

diff --git a/...uncher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTls.java b/...uncher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeTls.java
@@ -94,7 +94,7 @@ public void extendEnvironment(Environment.Builder builder)
 
     private DockerContainer createTrinoWorker(String workerName)
     {
-        return createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj11:" + imagesVersion, workerName)
+        return createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj17:" + imagesVersion, workerName)
                 .withCreateContainerCmdModifier(createContainerCmd -> createContainerCmd.withDomainName("docker.cluster"))
                 .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-tls/config-worker.properties")), CONTAINER_TRINO_CONFIG_PROPERTIES)
                 .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath("common/hadoop/hive.properties")), CONTAINER_TRINO_HIVE_PROPERTIES)

diff --git a/.../main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeOss.java b/.../main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeOss.java
@@ -24,6 +24,7 @@
 import io.trino.tests.product.launcher.env.common.Standard;
 import io.trino.tests.product.launcher.env.common.TestsEnvironment;
 import io.trino.tests.product.launcher.testcontainers.PortBinder;
+import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy;
 
 import javax.inject.Inject;
 
@@ -131,6 +132,7 @@ private DockerContainer createSparkContainer()
     {
         DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3-delta:" + hadoopImagesVersion, SPARK_CONTAINER_NAME)
                 .withCopyFileToContainer(forHostPath(configDir.getPath("spark-defaults.conf")), "/spark/conf/spark-defaults.conf")
+                .withStartupCheckStrategy(new IsRunningStartupCheckStrategy())
                 .waitingFor(forSelectedPorts(SPARK_THRIFT_PORT));
 
         portBinder.exposePort(container, SPARK_THRIFT_PORT);

diff --git a/...main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapReferrals.java b/...main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeLdapReferrals.java
@@ -42,6 +42,6 @@ protected String getPasswordAuthenticatorConfigPath()
     @Override
     protected String getBaseImage()
     {
-        return "centos7-oj11-openldap-referrals";
+        return "centos7-oj17-openldap-referrals";
     }
 }
diff --git a/...src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkHive.java b/...src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkHive.java
@@ -82,7 +82,7 @@ public void extendEnvironment(Environment.Builder builder)
     private DockerContainer createSpark()
     {
         // TODO: Switch to pure Spark 3 image once it's available (https://github.com/trinodb/trino/issues/7063)
-        DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3.0-iceberg:" + hadoopImagesVersion, "spark")
+        DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3-iceberg:" + hadoopImagesVersion, "spark")
                 .withEnv("HADOOP_USER_NAME", "hive")
                 .withCopyFileToContainer(
                         forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-hive/spark-defaults.conf")),

diff --git a/.../main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIceberg.java b/.../main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIceberg.java
@@ -81,7 +81,7 @@ public void extendEnvironment(Environment.Builder builder)
     @SuppressWarnings("resource")
     private DockerContainer createSpark()
     {
-        DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3.0-iceberg:" + hadoopImagesVersion, "spark")
+        DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3-iceberg:" + hadoopImagesVersion, "spark")
                 .withEnv("HADOOP_USER_NAME", "hive")
                 .withCopyFileToContainer(
                         forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-iceberg/spark-defaults.conf")),