From 6e6838ed1d41dcf77c3f89c147ea90529195abe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Gr=C3=BCter?= Date: Mon, 16 Dec 2013 16:59:05 +0100 Subject: [PATCH] Fixed example gradle file, removed dryRun. --- example/README.md | 4 ++-- example/build.gradle | 8 +++++++- example/gradle/init.gradle | 8 -------- example/gradlew | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 example/gradle/init.gradle diff --git a/example/README.md b/example/README.md index abc5b89..daee578 100644 --- a/example/README.md +++ b/example/README.md @@ -1,9 +1,9 @@ # Gradle Docker Plugin Example -The example in this folder is intended as an illustration on how to build runnable docker images with the gradle-docker plugin. +This exampl is intended as an illustration on how to build runnable docker images with the gradle-docker plugin in conjunction with Gradle Java and Application plugins. ## Example Application -The source code in this example consists of a simple main method that starts a jetty webserver to serves static html. +The source code in this example consists of a simple main method that starts a jetty webserver serving static html. ## Requirements - JDK 1.7 diff --git a/example/build.gradle b/example/build.gradle index 1bbac8b..e170b34 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -2,6 +2,13 @@ apply plugin: 'java' apply plugin: 'application' apply plugin: 'docker' +buildscript { + repositories { mavenCentral() } + dependencies { + classpath 'se.transmode.gradle:gradle-docker:1.0' + } +} + sourceCompatibility = 1.7 group = 'example' version = '1.0' @@ -13,6 +20,5 @@ dependencies { } distDocker { - dryRun true exposePort 8080 } diff --git a/example/gradle/init.gradle b/example/gradle/init.gradle deleted file mode 100644 index 159711a..0000000 --- a/example/gradle/init.gradle +++ /dev/null @@ -1,8 +0,0 @@ -allprojects { - buildscript { - repositories { mavenCentral() } - dependencies { - classpath 'se.transmode.gradle:gradle-docker:1.0' - } - } -} diff --git a/example/gradlew b/example/gradlew index d860f0c..91a7e26 100755 --- a/example/gradlew +++ b/example/gradlew @@ -161,4 +161,4 @@ function splitJvmOpts() { eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "--init-script=gradle/init.gradle" "$@" +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"