Skip to content
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.

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

added Java8 as option for base image #9

Merged
merged 2 commits into from Jun 16, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -31,6 +31,7 @@ class DockerPlugin implements Plugin<Project> {
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-pier"

DockerPluginExtension extension

Expand Down Expand Up @@ -72,6 +73,8 @@ class DockerPlugin implements Plugin<Project> {
return extension.baseImageJava16
case JavaVersion.VERSION_1_7:
return extension.baseImageJava17
case JavaVersion.VERSION_1_8:
return extension.baseImageJava18
default:
return extension.baseImageJava
}
Expand All @@ -91,6 +94,7 @@ class DockerPlugin implements Plugin<Project> {
baseImageJava = BASE_IMAGE_JAVA
baseImageJava16 = BASE_IMAGE_JAVA6
baseImageJava17 = BASE_IMAGE_JAVA7
baseImageJava18 = BASE_IMAGE_JAVA8
registry = ""
}
logger.info("Adding docker extension");
Expand Down
Expand Up @@ -22,5 +22,6 @@ class DockerPluginExtension {
String baseImageJava
String baseImageJava16
String baseImageJava17
String baseImageJava18
String registry
}
Expand Up @@ -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 {

Expand Down