diff --git a/jib-gradle-plugin/src/integration-test/resources/gradle/projects/default-target/build.gradle b/jib-gradle-plugin/src/integration-test/resources/gradle/projects/default-target/build.gradle index f45ea53857..82b0405ecd 100644 --- a/jib-gradle-plugin/src/integration-test/resources/gradle/projects/default-target/build.gradle +++ b/jib-gradle-plugin/src/integration-test/resources/gradle/projects/default-target/build.gradle @@ -15,6 +15,7 @@ dependencies { } jib { + from.image = 'eclipse-temurin:8-jdk-focal' container { args = ['An argument.'] ports = ['1000/tcp', '2000-2003/udp'] diff --git a/jib-gradle-plugin/src/integration-test/resources/gradle/projects/empty/build.gradle b/jib-gradle-plugin/src/integration-test/resources/gradle/projects/empty/build.gradle index 36985675b8..d5424994a1 100644 --- a/jib-gradle-plugin/src/integration-test/resources/gradle/projects/empty/build.gradle +++ b/jib-gradle-plugin/src/integration-test/resources/gradle/projects/empty/build.gradle @@ -13,6 +13,7 @@ repositories { } jib { + from.image = 'eclipse-temurin:8-jdk-focal' to { image = System.getProperty('_TARGET_IMAGE') credHelper = 'gcr' diff --git a/jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/build-jar-containerization.gradle b/jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/build-jar-containerization.gradle index d18d6dff02..f777652acb 100644 --- a/jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/build-jar-containerization.gradle +++ b/jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/build-jar-containerization.gradle @@ -27,5 +27,6 @@ jib { to { image = System.getProperty("_TARGET_IMAGE") } + from.image = 'eclipse-temurin:11-jdk-focal' containerizingMode = 'packaged' } diff --git a/jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/build-java11-incompatible.gradle b/jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/build-java11-incompatible.gradle index ed86033374..2cc07b662e 100644 --- a/jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/build-java11-incompatible.gradle +++ b/jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/build-java11-incompatible.gradle @@ -14,5 +14,5 @@ dependencies { compile files('libs/dependency-1.0.0.jar') } -jib.from.image = 'gcr.io/distroless/java' +jib.from.image = 'eclipse-temurin:8-jdk-focal' jib.to.image = System.getProperty("_TARGET_IMAGE") \ No newline at end of file diff --git a/jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/build-java11.gradle b/jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/build-java11.gradle index 62b07c9c24..8c563bfb00 100644 --- a/jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/build-java11.gradle +++ b/jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/build-java11.gradle @@ -14,4 +14,5 @@ dependencies { compile files('libs/dependency-1.0.0.jar') } +jib.from.image = 'eclipse-temurin:11-jdk-focal' jib.to.image = System.getProperty("_TARGET_IMAGE") \ No newline at end of file diff --git a/jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/build-timestamps-custom.gradle b/jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/build-timestamps-custom.gradle index 6fc9bb42a4..e99d1b5def 100644 --- a/jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/build-timestamps-custom.gradle +++ b/jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/build-timestamps-custom.gradle @@ -15,6 +15,7 @@ dependencies { } jib { + from.image = 'eclipse-temurin:11-jdk-focal' to.image = System.getProperty("_TARGET_IMAGE") container.filesModificationTime = '2011-12-03T10:15:30+09:00' container.creationTime = '2013-11-05T06:29:30+09:00' diff --git a/jib-gradle-plugin/src/integration-test/resources/gradle/projects/war_servlet25/build-tomcat.gradle b/jib-gradle-plugin/src/integration-test/resources/gradle/projects/war_servlet25/build-tomcat.gradle index d992798fa1..c8687a8ec5 100644 --- a/jib-gradle-plugin/src/integration-test/resources/gradle/projects/war_servlet25/build-tomcat.gradle +++ b/jib-gradle-plugin/src/integration-test/resources/gradle/projects/war_servlet25/build-tomcat.gradle @@ -27,7 +27,7 @@ war { } jib { - from.image = 'tomcat:10-jre8-temurin' + from.image = 'tomcat:10-jre8-temurin-focal' to { image = System.getProperty("_TARGET_IMAGE") credHelper = 'gcr' diff --git a/jib-maven-plugin/src/test/resources/maven/projects/default-target/pom.xml b/jib-maven-plugin/src/test/resources/maven/projects/default-target/pom.xml index 7e31c67d14..7c5ac11fb1 100644 --- a/jib-maven-plugin/src/test/resources/maven/projects/default-target/pom.xml +++ b/jib-maven-plugin/src/test/resources/maven/projects/default-target/pom.xml @@ -39,6 +39,9 @@ jib-maven-plugin ${jib-maven-plugin.version} + + eclipse-temurin:8-jdk-focal + An argument. diff --git a/jib-maven-plugin/src/test/resources/maven/projects/empty/pom.xml b/jib-maven-plugin/src/test/resources/maven/projects/empty/pom.xml index a6186c51ce..7ed2dd3410 100644 --- a/jib-maven-plugin/src/test/resources/maven/projects/empty/pom.xml +++ b/jib-maven-plugin/src/test/resources/maven/projects/empty/pom.xml @@ -29,6 +29,9 @@ jib-maven-plugin ${jib-maven-plugin.version} + + eclipse-temurin:11-jdk-focal + ${_TARGET_IMAGE} ${_ADDITIONAL_TAG} diff --git a/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-cred-helper-1.xml b/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-cred-helper-1.xml index 0f1060457d..3f88368030 100644 --- a/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-cred-helper-1.xml +++ b/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-cred-helper-1.xml @@ -39,6 +39,9 @@ jib-maven-plugin ${jib-maven-plugin.version} + + eclipse-temurin:8-jdk-focal + ${_TARGET_IMAGE} gcr diff --git a/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-cred-helper-2.xml b/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-cred-helper-2.xml index d72f64a0f3..7d8133e332 100644 --- a/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-cred-helper-2.xml +++ b/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-cred-helper-2.xml @@ -39,6 +39,9 @@ jib-maven-plugin ${jib-maven-plugin.version} + + eclipse-temurin:8-jdk-focal + ${_TARGET_IMAGE} diff --git a/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-jar-containerization.xml b/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-jar-containerization.xml index 165643b677..64d5bd8e50 100644 --- a/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-jar-containerization.xml +++ b/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-jar-containerization.xml @@ -52,6 +52,9 @@ jib-maven-plugin ${jib-maven-plugin.version} + + eclipse-temurin:11-jdk-focal + ${_TARGET_IMAGE} diff --git a/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-java11-incompatible.xml b/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-java11-incompatible.xml index 1db5ed7a4b..63bc430158 100644 --- a/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-java11-incompatible.xml +++ b/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-java11-incompatible.xml @@ -40,7 +40,7 @@ ${jib-maven-plugin.version} - gcr.io/distroless/java + eclipse-temurin:8-jdk-focal ${_TARGET_IMAGE} diff --git a/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-java11.xml b/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-java11.xml index be1ed2dc59..cff1d74d53 100644 --- a/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-java11.xml +++ b/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-java11.xml @@ -39,6 +39,9 @@ jib-maven-plugin ${jib-maven-plugin.version} + + eclipse-temurin:11-jdk-focal + ${_TARGET_IMAGE} diff --git a/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-no-to-image.xml b/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-no-to-image.xml index 75bad72779..c814f8141c 100644 --- a/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-no-to-image.xml +++ b/jib-maven-plugin/src/test/resources/maven/projects/simple/pom-no-to-image.xml @@ -40,6 +40,11 @@ com.google.cloud.tools jib-maven-plugin ${jib-maven-plugin.version} + + + eclipse-temurin:11-jdk-focal + + diff --git a/jib-maven-plugin/src/test/resources/maven/projects/war_servlet25/pom-tomcat.xml b/jib-maven-plugin/src/test/resources/maven/projects/war_servlet25/pom-tomcat.xml index 9eb5f67d5f..dc65ff9dea 100644 --- a/jib-maven-plugin/src/test/resources/maven/projects/war_servlet25/pom-tomcat.xml +++ b/jib-maven-plugin/src/test/resources/maven/projects/war_servlet25/pom-tomcat.xml @@ -45,7 +45,7 @@ ${jib-maven-plugin.version} - tomcat:10-jre8-temurin + tomcat:10-jre8-temurin-focal ${_TARGET_IMAGE}