Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Waibel2016-07-07 10:15:54 -0400
committerFlorian Waibel2016-07-07 10:15:54 -0400
commit299d1de8eeaf07a21cf1d7b54b881ee953a0fc81 (patch)
treeaddd7ef4668742a3a1db05ce67fd5d6d9b943e5d
parentbd4d06c1273bef5600fa39c32c6c99f4541dfcf7 (diff)
downloadorg.eclipse.virgo.samples-299d1de8eeaf07a21cf1d7b54b881ee953a0fc81.tar.gz
org.eclipse.virgo.samples-299d1de8eeaf07a21cf1d7b54b881ee953a0fc81.tar.xz
org.eclipse.virgo.samples-299d1de8eeaf07a21cf1d7b54b881ee953a0fc81.zip
Moves forward to dockerizor 0.7.0 and asciidoctor 1.5.3
Minor improvements to OSGi template and documentation
-rw-r--r--recipe-accessing-data-mongodb/build.gradle4
-rw-r--r--recipe-accessing-data-mongodb/org.eclipse.virgo.samples.recipe.data.mongodb/src/main/resources/META-INF/spring/applicationContext.xml4
-rw-r--r--recipe-accessing-data-mongodb/org.eclipse.virgo.samples.recipe.data.mongodb/src/main/resources/mongodb.properties1
-rw-r--r--recipe-accessing-data-mongodb/recipe-accessing-data-mongodb-app/build.gradle2
-rw-r--r--recipe-accessing-data-mongodb/recipe-accessing-data-mongodb-runtime/build.gradle2
-rw-r--r--recipe-accessing-data-mongodb/src/docs/asciidoc/08_dockerize_recipe.adoc36
-rw-r--r--recipe-accessing-data-mongodb/src/docs/asciidoc/recipe-accessing-data-mongodb.adoc2
-rw-r--r--recipe-custom-virgo/build.gradle6
-rw-r--r--recipe-messaging-rabbitmq/build.gradle6
-rw-r--r--recipe-messaging-rabbitmq/org.eclipse.virgo.samples.recipe.messaging.rabbitmq/src/main/resources/META-INF/spring/applicationContext.xml40
-rw-r--r--recipe-messaging-rabbitmq/org.eclipse.virgo.samples.recipe.messaging.rabbitmq/src/main/resources/rabbitmq.properties1
-rw-r--r--recipe-messaging-rabbitmq/org.eclipse.virgo.samples.recipe.messaging.rabbitmq/template.mf14
-rw-r--r--recipe-messaging-rabbitmq/src/docs/asciidoc/08_dockerize_recipe.adoc36
-rw-r--r--recipe-messaging-rabbitmq/src/docs/asciidoc/recipe-messaging-rabbitmq.adoc2
-rw-r--r--recipe-rest-service/build.gradle8
-rw-r--r--recipe-rest-service/gradle.properties2
-rw-r--r--recipe-rest-service/recipe-rest-service-app/build.gradle2
-rw-r--r--recipe-rest-service/recipe-rest-service-runtime/build.gradle2
-rw-r--r--recipe-serving-web-content/build.gradle6
-rw-r--r--recipe-serving-web-content/gradle.properties2
-rw-r--r--recipe-serving-web-content/recipe-serving-web-content-app/build.gradle2
-rw-r--r--recipe-serving-web-content/recipe-serving-web-content-runtime/build.gradle2
-rw-r--r--recipe-template/build.gradle11
-rw-r--r--recipe-template/src/docs/asciidoc/08_dockerize_recipe.adoc4
-rw-r--r--recipe-uploading-files/build.gradle9
-rw-r--r--recipe-uploading-files/recipe-uploading-files-app/build.gradle2
-rw-r--r--recipe-uploading-files/recipe-uploading-files-runtime/build.gradle2
27 files changed, 121 insertions, 89 deletions
diff --git a/recipe-accessing-data-mongodb/build.gradle b/recipe-accessing-data-mongodb/build.gradle
index 356fd81..667f628 100644
--- a/recipe-accessing-data-mongodb/build.gradle
+++ b/recipe-accessing-data-mongodb/build.gradle
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath "gradle.plugin.org.eclipse.virgo.bundlor:bundlor-plugin:0.2"
- classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.6.2"
+ classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.7.0"
classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
}
}
@@ -151,8 +151,6 @@ configure(dockerProjects) {
dockerizor {
maintainer = 'Florian Waibel <fwaibel@eclipsesource.com>'
- javaImage = 'java:openjdk-8u72-jre'
-
virgoVersion = 'latest'
hudsonJobName = 'gradle-build'
diff --git a/recipe-accessing-data-mongodb/org.eclipse.virgo.samples.recipe.data.mongodb/src/main/resources/META-INF/spring/applicationContext.xml b/recipe-accessing-data-mongodb/org.eclipse.virgo.samples.recipe.data.mongodb/src/main/resources/META-INF/spring/applicationContext.xml
index 3184db3..9e1452d 100644
--- a/recipe-accessing-data-mongodb/org.eclipse.virgo.samples.recipe.data.mongodb/src/main/resources/META-INF/spring/applicationContext.xml
+++ b/recipe-accessing-data-mongodb/org.eclipse.virgo.samples.recipe.data.mongodb/src/main/resources/META-INF/spring/applicationContext.xml
@@ -9,8 +9,10 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo.xsd" >
+<context:property-placeholder location="classpath:mongodb.properties" />
+
<!-- tag::configuration[] -->
- <mongo:db-factory dbname="recipes" host="localhost:27017" /><!--1-->
+ <mongo:db-factory dbname="recipes" host="${mongodb.host:localhost}:${mongodb.port:27017}" /><!--1-->
<mongo:repositories base-package="org.eclipse.virgo.samples.recipe.data.mongodb" /><!--2-->
<bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate"><!--3-->
diff --git a/recipe-accessing-data-mongodb/org.eclipse.virgo.samples.recipe.data.mongodb/src/main/resources/mongodb.properties b/recipe-accessing-data-mongodb/org.eclipse.virgo.samples.recipe.data.mongodb/src/main/resources/mongodb.properties
new file mode 100644
index 0000000..31ac772
--- /dev/null
+++ b/recipe-accessing-data-mongodb/org.eclipse.virgo.samples.recipe.data.mongodb/src/main/resources/mongodb.properties
@@ -0,0 +1 @@
+# MongoDB properties \ No newline at end of file
diff --git a/recipe-accessing-data-mongodb/recipe-accessing-data-mongodb-app/build.gradle b/recipe-accessing-data-mongodb/recipe-accessing-data-mongodb-app/build.gradle
index 7ccb946..84d5e27 100644
--- a/recipe-accessing-data-mongodb/recipe-accessing-data-mongodb-app/build.gradle
+++ b/recipe-accessing-data-mongodb/recipe-accessing-data-mongodb-app/build.gradle
@@ -1,5 +1,5 @@
dockerizor {
- repository = 'virgo-recipe/recipe-accessing-data-mongodb'
+ repository = 'virgo-recipe/accessing-data-mongodb-app'
description = 'Virgo Recipe MongoDB created with Gradle Plugin: com.eclipsesource.dockerizor'
pickupFiles = ['recipe-accessing-data-mongodb.plan']
diff --git a/recipe-accessing-data-mongodb/recipe-accessing-data-mongodb-runtime/build.gradle b/recipe-accessing-data-mongodb/recipe-accessing-data-mongodb-runtime/build.gradle
index ea81202..b0b88bd 100644
--- a/recipe-accessing-data-mongodb/recipe-accessing-data-mongodb-runtime/build.gradle
+++ b/recipe-accessing-data-mongodb/recipe-accessing-data-mongodb-runtime/build.gradle
@@ -1,5 +1,5 @@
dockerizor {
- repository = 'virgo-recipe/recipe-accessing-data-mongodb-runtime'
+ repository = 'virgo-recipe/accessing-data-mongodb-runtime'
description = 'Virgo Recipe MongoDB (runtime-only) created with Gradle Plugin: com.eclipsesource.dockerizor'
virgoHome = '/home/virgo/virgo-recipe-accessing-data-mongodb-runtime'
diff --git a/recipe-accessing-data-mongodb/src/docs/asciidoc/08_dockerize_recipe.adoc b/recipe-accessing-data-mongodb/src/docs/asciidoc/08_dockerize_recipe.adoc
new file mode 100644
index 0000000..c0e3b07
--- /dev/null
+++ b/recipe-accessing-data-mongodb/src/docs/asciidoc/08_dockerize_recipe.adoc
@@ -0,0 +1,36 @@
+
+== Dockerise the Application ==
+
+We use Gradle and Dockerizor to build the application.
+Instead of running the sample within the Eclipse IDE you can build a https://www.docker.com/[Docker] image:
+
+[source,sh]
+----
+$ ./gradlew dockerize
+----
+
+[NOTE]
+----
+This recipe assumes you have a local RabbitMQ up and running.
+----
+
+Let's create an isolated network `recipe_nw` to test the complete recipe:
+
+[source,sh]
+----
+docker network create -d bridge --subnet 172.25.0.0/16 recipe_nw
+----
+
+To start a temporary MongoDB container inside this network issue the following command:
+
+[source,sh]
+----
+$ docker run --rm -it --net=recipe_nw --name mongodb mongo:2.6.12
+----
+
+then run the application with the environment variable `mongodb.host` set to the container name used in the command above:
+
+[source,sh,subs="attributes"]
+----
+$ docker run --rm -it --net=recipe_nw --publish 8080 -e mongodb.host=mongodb virgo-recipe/{guide-short-name}-app
+----
diff --git a/recipe-accessing-data-mongodb/src/docs/asciidoc/recipe-accessing-data-mongodb.adoc b/recipe-accessing-data-mongodb/src/docs/asciidoc/recipe-accessing-data-mongodb.adoc
index 0059535..7589700 100644
--- a/recipe-accessing-data-mongodb/src/docs/asciidoc/recipe-accessing-data-mongodb.adoc
+++ b/recipe-accessing-data-mongodb/src/docs/asciidoc/recipe-accessing-data-mongodb.adoc
@@ -169,4 +169,4 @@ System.out Customer[id=570fa0b3eec8cfd2c9a99d99, firstName='Bob', lastName='Smit
...
----
-include::../../../../recipe-template/src/docs/asciidoc/08_dockerize_recipe.adoc[]
+include::08_dockerize_recipe.adoc[]
diff --git a/recipe-custom-virgo/build.gradle b/recipe-custom-virgo/build.gradle
index 3fe30b0..0c0f58a 100644
--- a/recipe-custom-virgo/build.gradle
+++ b/recipe-custom-virgo/build.gradle
@@ -8,8 +8,8 @@ buildscript {
}
dependencies {
classpath "gradle.plugin.org.eclipse.virgo.bundlor:bundlor-plugin:0.2"
- classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.6"
- classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.1'
+ classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.7.0"
+ classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
}
}
@@ -147,7 +147,7 @@ configure(dockerProjects) {
dockerizor {
maintainer = 'Florian Waibel <fwaibel@eclipsesource.com>'
- javaImage = 'java:openjdk-8u72-jre' // <3>
+ javaImage = 'java:8u92-jre-alpine' // <3>
virgoVersion = 'latest'
hudsonJobName = 'gradle-build'
diff --git a/recipe-messaging-rabbitmq/build.gradle b/recipe-messaging-rabbitmq/build.gradle
index 91ec5d4..127fa50 100644
--- a/recipe-messaging-rabbitmq/build.gradle
+++ b/recipe-messaging-rabbitmq/build.gradle
@@ -8,7 +8,7 @@ buildscript {
}
dependencies {
classpath "gradle.plugin.org.eclipse.virgo.bundlor:bundlor-plugin:0.2"
- classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.6.2"
+ classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.7.0"
classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
}
}
@@ -137,7 +137,7 @@ configure(virgoProjects) {
manifestTemplatePath = "template.mf"
propertiesPath = new File("${project.buildDir}/bundlor-properties/gradle.properties")
inputPath = ext.bundlorInputPath
- failOnWarnings = false
+ failOnWarnings = true
}
}
@@ -151,8 +151,6 @@ configure(dockerProjects) {
dockerizor {
maintainer = 'Florian Waibel <fwaibel@eclipsesource.com>'
- javaImage = 'java:openjdk-8u72-jre'
-
virgoVersion = 'latest'
hudsonJobName = 'gradle-build'
diff --git a/recipe-messaging-rabbitmq/org.eclipse.virgo.samples.recipe.messaging.rabbitmq/src/main/resources/META-INF/spring/applicationContext.xml b/recipe-messaging-rabbitmq/org.eclipse.virgo.samples.recipe.messaging.rabbitmq/src/main/resources/META-INF/spring/applicationContext.xml
index bd0a42f..5490299 100644
--- a/recipe-messaging-rabbitmq/org.eclipse.virgo.samples.recipe.messaging.rabbitmq/src/main/resources/META-INF/spring/applicationContext.xml
+++ b/recipe-messaging-rabbitmq/org.eclipse.virgo.samples.recipe.messaging.rabbitmq/src/main/resources/META-INF/spring/applicationContext.xml
@@ -10,6 +10,8 @@
http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+<context:property-placeholder location="classpath:rabbitmq.properties" />
+
<!-- tag::queue[] -->
<bean id="queue" class="org.springframework.amqp.core.Queue">
<constructor-arg name="name" value="spring-boot" />
@@ -26,17 +28,6 @@
</bean>
<!-- end::exchange[] -->
-<!--
-import org.springframework.amqp.core.Binding;
-
- @Bean
- Binding binding(Queue queue, TopicExchange exchange) {
- return BindingBuilder.bind(queue).to(exchange).with(queueName);
- }
- DestinationConfigurer.queueName, queue
- TopicExchangeRoutingKeyConfigurer exchange
- with(RoutingKey)
- -->
<!-- enum -->
<util:constant id="destination-type-queue" static-field="org.springframework.amqp.core.Binding.DestinationType.QUEUE"/>
<!--
@@ -55,43 +46,20 @@ import org.springframework.amqp.core.Binding;
</bean>
<!-- end::binding[] -->
- <!--
- @Bean
- Receiver receiver() {
- return new Receiver();
- }
- -->
<bean id="receiver" class="org.eclipse.virgo.samples.recipe.messaging.rabbitmq.Receiver" />
<!--
<context:component-scan base-package="org.eclipse.virgo.samples.recipe.messaging.rabbitmq" />
-->
- <!--
- @Bean
- MessageListenerAdapter listenerAdapter(Receiver receiver) {
- return new MessageListenerAdapter(receiver, "receiveMessage");
- }
- -->
<bean id="messageListener" class="org.springframework.amqp.rabbit.listener.adapter.MessageListenerAdapter">
<constructor-arg name="delegate" ref="receiver" />
<constructor-arg name="defaultListenerMethod" value="receiveMessage" />
</bean>
- <!--
- @Bean
- SimpleMessageListenerContainer container(ConnectionFactory connectionFactory, MessageListenerAdapter listenerAdapter) {
- SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
- container.setConnectionFactory(connectionFactory);
- container.setQueueNames(queueName);
- container.setMessageListener(listenerAdapter);
- return container;
- }
- -->
-
<!-- tag::connection_factory[] -->
<bean id="cachingConnectionFactory" class="org.springframework.amqp.rabbit.connection.CachingConnectionFactory">
- <property name="host" value="localhost" />
- <property name="port" value="5672" />
+ <property name="host" value="${rabbitmq.host:localhost}" />
+ <property name="port" value="${rabbitmq.port:5672}" />
</bean>
<bean id="connectionFactory" class="org.springframework.amqp.rabbit.connection.SimpleRoutingConnectionFactory">
<property name="defaultTargetConnectionFactory" ref="cachingConnectionFactory" />
diff --git a/recipe-messaging-rabbitmq/org.eclipse.virgo.samples.recipe.messaging.rabbitmq/src/main/resources/rabbitmq.properties b/recipe-messaging-rabbitmq/org.eclipse.virgo.samples.recipe.messaging.rabbitmq/src/main/resources/rabbitmq.properties
new file mode 100644
index 0000000..a903a01
--- /dev/null
+++ b/recipe-messaging-rabbitmq/org.eclipse.virgo.samples.recipe.messaging.rabbitmq/src/main/resources/rabbitmq.properties
@@ -0,0 +1 @@
+# RabbitMQ properties \ No newline at end of file
diff --git a/recipe-messaging-rabbitmq/org.eclipse.virgo.samples.recipe.messaging.rabbitmq/template.mf b/recipe-messaging-rabbitmq/org.eclipse.virgo.samples.recipe.messaging.rabbitmq/template.mf
index c245981..efd96bf 100644
--- a/recipe-messaging-rabbitmq/org.eclipse.virgo.samples.recipe.messaging.rabbitmq/template.mf
+++ b/recipe-messaging-rabbitmq/org.eclipse.virgo.samples.recipe.messaging.rabbitmq/template.mf
@@ -1,6 +1,12 @@
-Bundle-Version: 0.1
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
Bundle-Name: Virgo Recipe Messaging with RabbitMQ
Bundle-SymbolicName: org.eclipse.virgo.samples.recipe.messaging.rabbitmq
-Import-Bundle:
- org.springframework.beans,
- org.springframework.context
+Bundle-Version: ${version}
+Import-Template:
+ javax.annotation;version="0",
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, +1)}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, +1)}",
+ org.springframework.stereotype.*;version="${springframeworkVersion:[=.=.=.=, +1)}",
+ org.springframework.amqp.core.*;version="${springAmqpVersion:[=.=.=, +1)}",
+ org.springframework.amqp.rabbit.*;version="${springAmqpRabbitMqVersion:[=.=.=.=, +1)}"
diff --git a/recipe-messaging-rabbitmq/src/docs/asciidoc/08_dockerize_recipe.adoc b/recipe-messaging-rabbitmq/src/docs/asciidoc/08_dockerize_recipe.adoc
new file mode 100644
index 0000000..b8e7146
--- /dev/null
+++ b/recipe-messaging-rabbitmq/src/docs/asciidoc/08_dockerize_recipe.adoc
@@ -0,0 +1,36 @@
+
+== Dockerise the Application ==
+
+We use Gradle and Dockerizor to build the application.
+Instead of running the sample within the Eclipse IDE you can build a https://www.docker.com/[Docker] image:
+
+[source,sh]
+----
+$ ./gradlew dockerize
+----
+
+[NOTE]
+----
+This recipe assumes you have a local RabbitMQ up and running.
+----
+
+Let's create an isolated network `recipe_nw` to test the complete recipe:
+
+[source,sh]
+----
+docker network create -d bridge --subnet 172.25.0.0/16 recipe_nw
+----
+
+To start a temporary RabbitMQ container inside this network issue the following command:
+
+[source,sh]
+----
+$ docker run --rm -it --net=recipe_nw --name rabbitmq rabbitmq:3.6.2
+----
+
+then run the application with the environment variable `rabbitmq.host` set to the container name used in the command above:
+
+[source,sh,subs="attributes"]
+----
+$ docker run --rm -it --net=recipe_nw --publish 8080 -e rabbitmq.host=rabbitmq virgo-recipe/{guide-short-name}-app
+----
diff --git a/recipe-messaging-rabbitmq/src/docs/asciidoc/recipe-messaging-rabbitmq.adoc b/recipe-messaging-rabbitmq/src/docs/asciidoc/recipe-messaging-rabbitmq.adoc
index e2b03dc..2304b36 100644
--- a/recipe-messaging-rabbitmq/src/docs/asciidoc/recipe-messaging-rabbitmq.adoc
+++ b/recipe-messaging-rabbitmq/src/docs/asciidoc/recipe-messaging-rabbitmq.adoc
@@ -204,4 +204,4 @@ o.s.a.r.c.CachingConnectionFactory Created new connection: SimpleConnection@63
System.out Received <Hello from RabbitMQ!>
----
-include::../../../../recipe-template/src/docs/asciidoc/08_dockerize_recipe.adoc[]
+include::08_dockerize_recipe.adoc[]
diff --git a/recipe-rest-service/build.gradle b/recipe-rest-service/build.gradle
index 0e036f6..be5e2b3 100644
--- a/recipe-rest-service/build.gradle
+++ b/recipe-rest-service/build.gradle
@@ -8,12 +8,12 @@ buildscript {
}
dependencies {
classpath "gradle.plugin.org.eclipse.virgo.bundlor:bundlor-plugin:0.2"
- classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.6"
- classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.1'
+ classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.7.0"
+ classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
}
}
-apply plugin: 'org.asciidoctor.gradle.asciidoctor'
+apply plugin: 'org.asciidoctor.convert'
ext.virgoProjects = [
project(':org.eclipse.virgo.samples.recipe.restservice'),
@@ -151,8 +151,6 @@ configure(dockerProjects) {
dockerizor {
maintainer = 'Florian Waibel <fwaibel@eclipsesource.com>'
- javaImage = 'java:openjdk-8u72-jre'
-
virgoVersion = 'latest'
hudsonJobName = 'gradle-build'
diff --git a/recipe-rest-service/gradle.properties b/recipe-rest-service/gradle.properties
index 7f8c384..473c1ec 100644
--- a/recipe-rest-service/gradle.properties
+++ b/recipe-rest-service/gradle.properties
@@ -3,5 +3,5 @@ springframeworkVersion = 4.2.1.RELEASE
commonsLoggingVersion = 1.2.0
jacksonCoreVersion = 2.6.4
-jacksonAnnotationsVersion = 2.6.3
+jacksonAnnotationsVersion = 2.6.4
jacksonDatabindVersion = 2.6.4
diff --git a/recipe-rest-service/recipe-rest-service-app/build.gradle b/recipe-rest-service/recipe-rest-service-app/build.gradle
index 44e12ff..f9057a6 100644
--- a/recipe-rest-service/recipe-rest-service-app/build.gradle
+++ b/recipe-rest-service/recipe-rest-service-app/build.gradle
@@ -1,5 +1,5 @@
dockerizor {
- repository = 'virgo-recipe/recipe-rest-service-app'
+ repository = 'virgo-recipe/rest-service-app'
description = 'Virgo Recipe REST service created with Gradle Plugin: com.eclipsesource.dockerizor'
pickupFiles = ['recipe-restservice.plan']
diff --git a/recipe-rest-service/recipe-rest-service-runtime/build.gradle b/recipe-rest-service/recipe-rest-service-runtime/build.gradle
index 735ed40..a2a1501 100644
--- a/recipe-rest-service/recipe-rest-service-runtime/build.gradle
+++ b/recipe-rest-service/recipe-rest-service-runtime/build.gradle
@@ -1,5 +1,5 @@
dockerizor {
- repository = 'virgo-recipe/recipe-rest-service-runtime'
+ repository = 'virgo-recipe/rest-service-runtime'
description = 'Virgo Recipe REST service (runtime-only) created with Gradle Plugin: com.eclipsesource.dockerizor'
}
diff --git a/recipe-serving-web-content/build.gradle b/recipe-serving-web-content/build.gradle
index cf1189b..a068dae 100644
--- a/recipe-serving-web-content/build.gradle
+++ b/recipe-serving-web-content/build.gradle
@@ -8,7 +8,7 @@ buildscript {
}
dependencies {
classpath "gradle.plugin.org.eclipse.virgo.bundlor:bundlor-plugin:0.2"
- classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.6.2"
+ classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.7.0"
classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
}
}
@@ -40,8 +40,6 @@ configure(virgoProjects) {
apply plugin: 'eclipse'
apply plugin: 'eclipse-wtp'
- version = '0.1.0.BUILD-SNAPSHOT'
-
compileJava {
options.encoding = 'utf-8'
options.fork = true
@@ -151,8 +149,6 @@ configure(dockerProjects) {
dockerizor {
maintainer = 'Florian Waibel <fwaibel@eclipsesource.com>'
- javaImage = 'java:openjdk-8u72-jre'
-
virgoVersion = 'latest'
hudsonJobName = 'gradle-build'
diff --git a/recipe-serving-web-content/gradle.properties b/recipe-serving-web-content/gradle.properties
index 8f2ffa0..1f830fb 100644
--- a/recipe-serving-web-content/gradle.properties
+++ b/recipe-serving-web-content/gradle.properties
@@ -1,3 +1,5 @@
+version = 0.1.0.BUILD-SNAPSHOT
+
springframeworkVersion = 4.2.4.RELEASE
javassistVersion = 3.20.0-GA
diff --git a/recipe-serving-web-content/recipe-serving-web-content-app/build.gradle b/recipe-serving-web-content/recipe-serving-web-content-app/build.gradle
index bd035ba..4fe0a1e 100644
--- a/recipe-serving-web-content/recipe-serving-web-content-app/build.gradle
+++ b/recipe-serving-web-content/recipe-serving-web-content-app/build.gradle
@@ -7,7 +7,7 @@ apply plugin: "com.eclipsesource.dockerizor"
dockerize.dependsOn ':org.eclipse.virgo.samples.recipe.web:build'
dockerizor {
- repository = 'virgo-recipe/web'
+ repository = 'virgo-recipe/serving-web-content-app'
description = 'Virgo Recipe Serving Web Content created with Gradle Plugin: com.eclipsesource.dockerizor'
pickupFiles = ['recipe-serving-web-content.plan']
diff --git a/recipe-serving-web-content/recipe-serving-web-content-runtime/build.gradle b/recipe-serving-web-content/recipe-serving-web-content-runtime/build.gradle
index 7c05080..7b96052 100644
--- a/recipe-serving-web-content/recipe-serving-web-content-runtime/build.gradle
+++ b/recipe-serving-web-content/recipe-serving-web-content-runtime/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'base'
apply plugin: "com.eclipsesource.dockerizor"
dockerizor {
- repository = 'virgo-recipe/web-runtime'
+ repository = 'virgo-recipe/serving-web-content-runtime'
description = 'Virgo Recipe Serving Web Content (runtime-only) created with Gradle Plugin: com.eclipsesource.dockerizor'
virgoHome = '/home/virgo/virgo-recipe-serving-web-content-runtime'
diff --git a/recipe-template/build.gradle b/recipe-template/build.gradle
index 3b86351..8afe2d3 100644
--- a/recipe-template/build.gradle
+++ b/recipe-template/build.gradle
@@ -8,12 +8,12 @@ buildscript {
}
dependencies {
classpath "gradle.plugin.org.eclipse.virgo.bundlor:bundlor-plugin:0.2"
- classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.6"
- classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.1'
+ classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.7.0"
+ classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
}
}
-apply plugin: 'org.asciidoctor.gradle.asciidoctor'
+apply plugin: 'org.asciidoctor.convert'
ext.virgoProjects = [
project(':org.eclipse.virgo.samples.recipe.xyz'),
@@ -148,11 +148,6 @@ configure(dockerProjects) {
dockerizor {
maintainer = 'Florian Waibel <fwaibel@eclipsesource.com>'
- javaImage = 'java:openjdk-8u72-jre'
-
- virgoVersion = 'latest'
- hudsonJobName = 'gradle-build'
-
createLocalCopy = System.properties['local.build'] == 'true'
removeAdminConsole = System.properties['local.build'] != 'true'
diff --git a/recipe-template/src/docs/asciidoc/08_dockerize_recipe.adoc b/recipe-template/src/docs/asciidoc/08_dockerize_recipe.adoc
index 89f64ad..599630d 100644
--- a/recipe-template/src/docs/asciidoc/08_dockerize_recipe.adoc
+++ b/recipe-template/src/docs/asciidoc/08_dockerize_recipe.adoc
@@ -11,7 +11,7 @@ $ ./gradlew dockerize
and run the application with:
-[source,sh]
+[source,sh,subs="attributes"]
----
-$ docker run
+$ docker run --rm -it --name {guide-short-name} --publish 8080:8080 virgo-recipe/{guide-short-name}-app
----
diff --git a/recipe-uploading-files/build.gradle b/recipe-uploading-files/build.gradle
index a716902..e963a40 100644
--- a/recipe-uploading-files/build.gradle
+++ b/recipe-uploading-files/build.gradle
@@ -8,7 +8,7 @@ buildscript {
}
dependencies {
classpath "gradle.plugin.org.eclipse.virgo.bundlor:bundlor-plugin:0.2"
- classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.6"
+ classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.7.0"
classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.1'
}
}
@@ -19,10 +19,7 @@ ext.virgoProjects = [
project(':org.eclipse.virgo.samples.recipe.uploading'),
]
-ext.dockerProjects = [
- project(':recipe-uploading-files-runtime'),
- project(':recipe-uploading-files-app'),
-]
+ext.dockerProjects = subprojects.findAll {it.name.contains('-runtime') || it.name.contains('-app')}
configure(virgoProjects + dockerProjects) {
repositories {
@@ -151,8 +148,6 @@ configure(dockerProjects) {
dockerizor {
maintainer = 'Florian Waibel <fwaibel@eclipsesource.com>'
- javaImage = 'java:openjdk-8u72-jre'
-
virgoVersion = 'latest'
hudsonJobName = 'gradle-build'
diff --git a/recipe-uploading-files/recipe-uploading-files-app/build.gradle b/recipe-uploading-files/recipe-uploading-files-app/build.gradle
index cd7f8ec..8e6d966 100644
--- a/recipe-uploading-files/recipe-uploading-files-app/build.gradle
+++ b/recipe-uploading-files/recipe-uploading-files-app/build.gradle
@@ -1,5 +1,5 @@
dockerizor {
- repository = 'virgo-recipe/recipe-uploading-files-app'
+ repository = 'virgo-recipe/uploading-files-app'
description = 'Virgo Recipe uploading files created with Gradle Plugin: com.eclipsesource.dockerizor'
pickupFiles = ['recipe-uploading-files.plan']
diff --git a/recipe-uploading-files/recipe-uploading-files-runtime/build.gradle b/recipe-uploading-files/recipe-uploading-files-runtime/build.gradle
index 17589cc..39f1dda 100644
--- a/recipe-uploading-files/recipe-uploading-files-runtime/build.gradle
+++ b/recipe-uploading-files/recipe-uploading-files-runtime/build.gradle
@@ -1,5 +1,5 @@
dockerizor {
- repository = 'virgo-recipe/recipe-uploading-files-runtime'
+ repository = 'virgo-recipe/uploading-files-runtime'
description = 'Virgo Recipe uploading files (runtime-only) created with Gradle Plugin: com.eclipsesource.dockerizor'
}

Back to the top