Skip to content

Update docker-images to 121 #26650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Update docker-images to 121 #26650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
<dep.cassandra.version>4.17.0</dep.cassandra.version>
<dep.checkstyle.version>10.23.1</dep.checkstyle.version>
<dep.confluent.version>7.8.0</dep.confluent.version>
<dep.docker.images.version>119</dep.docker.images.version>
<dep.docker.images.version>121</dep.docker.images.version>
<dep.drift.version>1.24</dep.drift.version>
<dep.flyway.version>11.13.1</dep.flyway.version>
<dep.frontend-maven-plugin.version>1.15.1</dep.frontend-maven-plugin.version>
Expand Down
3 changes: 2 additions & 1 deletion ...cher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeAzure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ public void extendEnvironment(Environment.Builder builder)

private DockerContainer createSpark()
{
DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3-iceberg:" + hadoopImagesVersion, "spark")
// TODO Update the image to spark4-iceberg once "java.lang.NoClassDefFoundError: org/codehaus/jackson/map/ObjectMapper" is fixed
DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3-iceberg:119", "spark")
.withEnv("HADOOP_USER_NAME", "hive")
.withCopyFileToContainer(
forHostPath(getSparkConf()),
Expand Down
2 changes: 1 addition & 1 deletion ...uncher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeGcs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public void extendEnvironment(Environment.Builder builder)
private DockerContainer createSpark(MountableFile credentialsFile)
{
String containerGcpCredentialsFile = "/spark/conf/gcp-credentials.json";
DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3-iceberg:" + hadoopImagesVersion, "spark")
DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark4-iceberg:" + hadoopImagesVersion, "spark")
.withEnv("HADOOP_USER_NAME", "hive")
.withCopyFileToContainer(
forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/multinode-gcs/spark-defaults.conf")),
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkHive.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ public void extendEnvironment(Environment.Builder builder)
@SuppressWarnings("resource")
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-iceberg:" + hadoopImagesVersion, "spark")
// TODO: Switch to pure Spark 4 image once it's available (https://github.com/trinodb/trino/issues/7063)
DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark4-iceberg:" + hadoopImagesVersion, "spark")
.withEnv("HADOOP_USER_NAME", "hive")
.withCopyFileToContainer(
forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-hive/spark-defaults.conf")),
Expand Down
2 changes: 1 addition & 1 deletion ...o/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkHiveNoStatsFallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void extendEnvironment(Environment.Builder builder)
@SuppressWarnings("resource")
private DockerContainer createSpark()
{
DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3-iceberg:" + hadoopImagesVersion, "spark")
DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark4-iceberg:" + hadoopImagesVersion, "spark")
.withEnv("HADOOP_USER_NAME", "hive")
.withCopyFileToContainer(forHostPath(configDir.getPath("spark-defaults.conf")), "/spark/conf/spark-defaults.conf")
.withCommand(
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIceberg.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void extendEnvironment(Environment.Builder builder)
@SuppressWarnings("resource")
private DockerContainer createSpark()
{
DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3-iceberg:" + hadoopImagesVersion, "spark")
DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark4-iceberg:" + hadoopImagesVersion, "spark")
.withEnv("HADOOP_USER_NAME", "hive")
.withCopyFileToContainer(
forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-iceberg/spark-defaults.conf")),
Expand Down
2 changes: 1 addition & 1 deletion ...io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergJdbcCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public DockerContainer createPostgreSql()
private DockerContainer createSpark()
{
try {
DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3-iceberg:" + imagesVersion, "spark")
DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark4-iceberg:" + imagesVersion, "spark")
.withEnv("HADOOP_USER_NAME", "hive")
.withCopyFileToContainer(
forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-iceberg-jdbc-catalog/spark-defaults.conf")),
Expand Down
2 changes: 1 addition & 1 deletion ...java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergNessie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public void extendEnvironment(Environment.Builder builder)
@SuppressWarnings("resource")
private DockerContainer createSparkContainer()
{
DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3-iceberg:" + hadoopImagesVersion, SPARK)
DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark4-iceberg:" + hadoopImagesVersion, SPARK)
.withEnv("HADOOP_USER_NAME", "hive")
.withCopyFileToContainer(
forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-iceberg-nessie/spark-defaults.conf")),
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergRest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ private DockerContainer createRESTContainer()
@SuppressWarnings("resource")
private DockerContainer createSparkContainer()
{
DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3-iceberg:" + hadoopImagesVersion, SPARK_CONTAINER_NAME)
DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark4-iceberg:" + hadoopImagesVersion, SPARK_CONTAINER_NAME)
.withEnv("HADOOP_USER_NAME", "hive")
.withCopyFileToContainer(
forHostPath(dockerFiles.getDockerFilesHostPath(
Expand Down
Loading