-
Notifications
You must be signed in to change notification settings - Fork 17
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
Docker support based on Jib #19
Open
danielpetisme
wants to merge
3
commits into
jponge:master
Choose a base branch
from
danielpetisme:feat-18
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
sudo: false | ||
addons: | ||
apt: | ||
packages: | ||
- oracle-java8-installer | ||
- oracle-java9-installer | ||
|
||
language: java | ||
|
||
jdk: | ||
- oraclejdk8 | ||
- oraclejdk9 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -18,6 +18,8 @@ package io.vertx.gradle | |||||
|
||||||
import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin | ||||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar | ||||||
import com.google.cloud.tools.jib.gradle.JibExtension | ||||||
import com.google.cloud.tools.jib.gradle.JibPlugin | ||||||
import netflix.nebula.dependency.recommender.DependencyRecommendationsPlugin | ||||||
import netflix.nebula.dependency.recommender.provider.RecommendationProviderContainer | ||||||
import org.apache.tools.ant.taskdefs.condition.Os | ||||||
|
@@ -57,6 +59,7 @@ class VertxPlugin : Plugin<Project> { | |||||
addVertxCoreDependency(project) | ||||||
defineMainClassName(project) | ||||||
configureShadowPlugin(project) | ||||||
configureJibPlugin(project) | ||||||
configureVertxRunTask(project) | ||||||
configureVertxDebugTask(project) | ||||||
} | ||||||
|
@@ -91,6 +94,7 @@ class VertxPlugin : Plugin<Project> { | |||||
project.pluginManager.apply(ApplicationPlugin::class.java) | ||||||
project.pluginManager.apply(ShadowPlugin::class.java) | ||||||
project.pluginManager.apply(DependencyRecommendationsPlugin::class.java) | ||||||
project.pluginManager.apply(JibPlugin::class.java) | ||||||
logger.debug("The plugins needed by the Vert.x plugin have been applied") | ||||||
} | ||||||
|
||||||
|
@@ -141,6 +145,27 @@ class VertxPlugin : Plugin<Project> { | |||||
logger.debug("The shadow plugin has been configured") | ||||||
} | ||||||
|
||||||
private fun configureJibPlugin(project: Project) { | ||||||
val jibExtension = project.extensions.getByName("jib") as JibExtension | ||||||
val vertxExtension = project.vertxExtension() | ||||||
val tag = if (project.version != Project.DEFAULT_VERSION) project.version else "latest" | ||||||
jibExtension.apply { | ||||||
from { imageConfiguration -> | ||||||
imageConfiguration.image = "openjdk:8-jdk-alpine" | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
I think 'jre' is what we need |
||||||
} | ||||||
to { imageConfiguration -> | ||||||
imageConfiguration.image = "${project.name}:$tag" | ||||||
} | ||||||
container { containerParameters -> | ||||||
containerParameters.useCurrentTimestamp = true | ||||||
containerParameters.jvmFlags = vertxExtension.jvmArgs | ||||||
containerParameters.mainClass = vertxExtension.launcher | ||||||
containerParameters.args = vertxExtension.args | ||||||
} | ||||||
} | ||||||
logger.debug("The jib plugin has been configured") | ||||||
} | ||||||
|
||||||
private fun createVertxTasks(project: Project) { | ||||||
project.tasks.create("vertxRun", JavaExec::class.java).dependsOn("classes") | ||||||
project.tasks.create("vertxDebug", JavaExec::class.java).dependsOn("classes") | ||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it really needed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh nevermind, you do need it.
Going into
src/test/gradle/vertx-web-sample
runninggradle tasks
fails because of that.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
com.google.cloud.tools:com.google.cloud.tools.jib.gradle.plugin
seems only present in mavenCentral and not jcenter.The Gradle plugin portal is a mirror to jcenter and Maven Central thats why it works wit the this snippet.
The options I can see:
jib-gradle-plugin
to jcenter (the jib maven plugin is already published). Do you know anyone able to do that?mavenCentral()
(cleaner than pointing the plugin portal)We should also update the documentation to explicit the need of Maven Central as a replacement/complement of JCenter.
WDYT?