From 3fa293549e3f8b9a026a6c3637f9f1b6814d1edd Mon Sep 17 00:00:00 2001 From: Andrew Glover Date: Fri, 13 Jun 2014 13:46:24 -0700 Subject: [PATCH 1/2] added Java8 as option for base image --- .../se/transmode/gradle/plugins/docker/DockerPlugin.groovy | 4 ++++ .../gradle/plugins/docker/DockerPluginExtension.groovy | 1 + .../transmode/gradle/plugins/docker/DockerPluginTest.groovy | 1 + 3 files changed, 6 insertions(+) diff --git a/src/main/groovy/se/transmode/gradle/plugins/docker/DockerPlugin.groovy b/src/main/groovy/se/transmode/gradle/plugins/docker/DockerPlugin.groovy index 94922d1..2bf8119 100644 --- a/src/main/groovy/se/transmode/gradle/plugins/docker/DockerPlugin.groovy +++ b/src/main/groovy/se/transmode/gradle/plugins/docker/DockerPlugin.groovy @@ -31,6 +31,7 @@ class DockerPlugin implements Plugin { private static final String BASE_IMAGE_JAVA7 = "dockerfile/java" private static final String BASE_IMAGE_JAVA = BASE_IMAGE_JAVA7 private static final String DOCKER_BINARY = "docker" + private static final String BASE_IMAGE_JAVA8 = "aglover/java8" DockerPluginExtension extension @@ -72,6 +73,8 @@ class DockerPlugin implements Plugin { return extension.baseImageJava16 case JavaVersion.VERSION_1_7: return extension.baseImageJava17 + case JavaVersion.VERSION_1_8: + return extension.baseImageJava18 default: return extension.baseImageJava } @@ -91,6 +94,7 @@ class DockerPlugin implements Plugin { baseImageJava = BASE_IMAGE_JAVA baseImageJava16 = BASE_IMAGE_JAVA6 baseImageJava17 = BASE_IMAGE_JAVA7 + baseImageJava18 = BASE_IMAGE_JAVA8 registry = "" } logger.info("Adding docker extension"); diff --git a/src/main/groovy/se/transmode/gradle/plugins/docker/DockerPluginExtension.groovy b/src/main/groovy/se/transmode/gradle/plugins/docker/DockerPluginExtension.groovy index b688eae..4df484d 100644 --- a/src/main/groovy/se/transmode/gradle/plugins/docker/DockerPluginExtension.groovy +++ b/src/main/groovy/se/transmode/gradle/plugins/docker/DockerPluginExtension.groovy @@ -22,5 +22,6 @@ class DockerPluginExtension { String baseImageJava String baseImageJava16 String baseImageJava17 + String baseImageJava18 String registry } diff --git a/src/test/groovy/se/transmode/gradle/plugins/docker/DockerPluginTest.groovy b/src/test/groovy/se/transmode/gradle/plugins/docker/DockerPluginTest.groovy index fd0d43d..0baea9c 100644 --- a/src/test/groovy/se/transmode/gradle/plugins/docker/DockerPluginTest.groovy +++ b/src/test/groovy/se/transmode/gradle/plugins/docker/DockerPluginTest.groovy @@ -55,5 +55,6 @@ class DockerPluginTest { assertThat task.maintainer, is(equalTo(testMaintainer)) } + } From 19922f5501ca847b66b901c87d40f3c3ec82a81f Mon Sep 17 00:00:00 2001 From: Andrew Glover Date: Sun, 15 Jun 2014 20:25:40 -0700 Subject: [PATCH 2/2] updated to use the proper docker image -- java8-pier --- .../transmode/gradle/plugins/docker/DockerPlugin.groovy | 2 +- .../gradle/plugins/docker/DockerPluginTest.groovy | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/groovy/se/transmode/gradle/plugins/docker/DockerPlugin.groovy b/src/main/groovy/se/transmode/gradle/plugins/docker/DockerPlugin.groovy index 2bf8119..fcf37ca 100644 --- a/src/main/groovy/se/transmode/gradle/plugins/docker/DockerPlugin.groovy +++ b/src/main/groovy/se/transmode/gradle/plugins/docker/DockerPlugin.groovy @@ -31,7 +31,7 @@ class DockerPlugin implements Plugin { private static final String BASE_IMAGE_JAVA7 = "dockerfile/java" private static final String BASE_IMAGE_JAVA = BASE_IMAGE_JAVA7 private static final String DOCKER_BINARY = "docker" - private static final String BASE_IMAGE_JAVA8 = "aglover/java8" + private static final String BASE_IMAGE_JAVA8 = "aglover/java8-pier" DockerPluginExtension extension diff --git a/src/test/groovy/se/transmode/gradle/plugins/docker/DockerPluginTest.groovy b/src/test/groovy/se/transmode/gradle/plugins/docker/DockerPluginTest.groovy index 0baea9c..2e678be 100644 --- a/src/test/groovy/se/transmode/gradle/plugins/docker/DockerPluginTest.groovy +++ b/src/test/groovy/se/transmode/gradle/plugins/docker/DockerPluginTest.groovy @@ -15,13 +15,14 @@ */ package se.transmode.gradle.plugins.docker -import org.junit.Test -import org.gradle.testfixtures.ProjectBuilder import org.gradle.api.Project +import org.gradle.testfixtures.ProjectBuilder +import org.junit.Test import static org.hamcrest.Matchers.equalTo import static org.hamcrest.Matchers.is -import static org.junit.Assert.* +import static org.junit.Assert.assertThat +import static org.junit.Assert.assertTrue class DockerPluginTest { @@ -55,6 +56,5 @@ class DockerPluginTest { assertThat task.maintainer, is(equalTo(testMaintainer)) } - }