Skip to content

Commit

Permalink
Update to base images version 1.2.8
Browse files Browse the repository at this point in the history 
This could help for fabric8io#1024, fabric8io#1012 and fabric8io#956
  • Loading branch information
@rhuss
rhuss committed Dec 10, 2015
1 parent 92325b1 commit 02dce6e
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion quickstart/cdi/camel-http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<weld.version>2.3.2.Final</weld.version>

<!-- Docker & Fabric8 Configs -->
<docker.from>fabric8/s2i-java:1.2.5</docker.from>
<docker.from>fabric8/s2i-java:1.2.8</docker.from>
<fabric8.dockerUser>fabric8/</fabric8.dockerUser>
<docker.image>${fabric8.dockerUser}${project.artifactId}:${project.version}</docker.image>
<docker.port.container.jolokia>8778</docker.port.container.jolokia>
Expand Down
2 changes: 1 addition & 1 deletion quickstart/cdi/camel-jetty/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<weld.version>2.3.2.Final</weld.version>

<!-- Docker & Fabric8 Configs -->
<docker.from>fabric8/s2i-java:1.2.5</docker.from>
<docker.from>fabric8/s2i-java:1.2.8</docker.from>
<fabric8.dockerUser>fabric8/</fabric8.dockerUser>
<docker.image>${fabric8.dockerUser}${project.artifactId}:${project.version}</docker.image>
<docker.port.container.jolokia>8778</docker.port.container.jolokia>
Expand Down
2 changes: 1 addition & 1 deletion quickstart/cdi/camel-mq/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<weld.version>2.3.2.Final</weld.version>

<!-- Docker & Fabric8 Configs -->
<docker.from>fabric8/s2i-java:1.2.5</docker.from>
<docker.from>fabric8/s2i-java:1.2.8</docker.from>
<fabric8.dockerUser>fabric8/</fabric8.dockerUser>
<docker.image>${fabric8.dockerUser}${project.artifactId}:${project.version}</docker.image>
<docker.port.container.jolokia>8778</docker.port.container.jolokia>
Expand Down
2 changes: 1 addition & 1 deletion quickstart/cdi/camel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<weld.version>2.3.2.Final</weld.version>

<!-- Docker & Fabric8 Configs -->
<docker.from>fabric8/s2i-java:1.2.5</docker.from>
<docker.from>fabric8/s2i-java:1.2.8</docker.from>
<fabric8.dockerUser>fabric8/</fabric8.dockerUser>
<docker.image>${fabric8.dockerUser}${project.artifactId}:${project.version}</docker.image>
<docker.port.container.jolokia>8778</docker.port.container.jolokia>
Expand Down
2 changes: 1 addition & 1 deletion quickstart/cdi/cxf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<http.port>9092</http.port>

<!-- Docker & Fabric8 Configs -->
<docker.from>fabric8/s2i-java:1.2.5</docker.from>
<docker.from>fabric8/s2i-java:1.2.8</docker.from>
<fabric8.dockerUser>fabric8/</fabric8.dockerUser>
<docker.image>${fabric8.dockerUser}${project.artifactId}:${project.version}</docker.image>
<docker.port.container.http>${http.port}</docker.port.container.http>
Expand Down
2 changes: 1 addition & 1 deletion quickstart/java/camel-spring/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<camel.version>2.16.1</camel.version>

<!-- Docker & Fabric8 Configs -->
<docker.from>fabric8/s2i-java:1.2.5</docker.from>
<docker.from>fabric8/s2i-java:1.2.8</docker.from>
<fabric8.dockerUser>fabric8/</fabric8.dockerUser>
<docker.image>${fabric8.dockerUser}${project.artifactId}:${project.version}</docker.image>
<docker.port.container.jolokia>8778</docker.port.container.jolokia>
Expand Down
2 changes: 1 addition & 1 deletion quickstart/java/simple-mainclass/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<docker.maven.plugin.version>0.13.6</docker.maven.plugin.version>

<!-- Docker & Fabric8 Configs -->
<docker.from>fabric8/s2i-java:1.2.5</docker.from>
<docker.from>fabric8/s2i-java:1.2.8</docker.from>
<fabric8.dockerUser>fabric8/</fabric8.dockerUser>
<docker.image>${fabric8.dockerUser}${project.artifactId}:${project.version}</docker.image>
<docker.port.container.jolokia>8778</docker.port.container.jolokia>
Expand Down
2 changes: 1 addition & 1 deletion quickstart/karaf/camel-amq/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<karaf.version>2.4.3</karaf.version>
<karaf.plugin.version>4.0.3</karaf.plugin.version>

<docker.from>fabric8/s2i-karaf:1.2.5</docker.from>
<docker.from>fabric8/s2i-karaf:1.2.8</docker.from>
<fabric8.dockerUser>fabric8/</fabric8.dockerUser>
<docker.image>${fabric8.dockerUser}${project.artifactId}:${project.version}</docker.image>
<docker.assemblyDescriptor>${basedir}/src/main/fabric8/assembly.xml</docker.assemblyDescriptor>
Expand Down
2 changes: 1 addition & 1 deletion quickstart/karaf/camel-log/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<karaf.version>2.4.3</karaf.version>
<karaf.plugin.version>4.0.3</karaf.plugin.version>

<docker.from>fabric8/s2i-karaf:1.2.5</docker.from>
<docker.from>fabric8/s2i-karaf:1.2.8</docker.from>
<fabric8.dockerUser>fabric8/</fabric8.dockerUser>
<docker.image>${fabric8.dockerUser}quickstart-karaf-camellog:${project.version}</docker.image>
<docker.assemblyDescriptor>${basedir}/src/main/fabric8/assembly.xml</docker.assemblyDescriptor>
Expand Down
2 changes: 1 addition & 1 deletion quickstart/karaf/camel-rest-sql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<spring.features.version>3.0.4</spring.features.version>
<spring.tx.feature.version>3.2.11.RELEASE_1</spring.tx.feature.version>

<docker.from>fabric8/s2i-karaf:1.2.5</docker.from>
<docker.from>fabric8/s2i-karaf:1.2.8</docker.from>
<fabric8.dockerUser>fabric8/</fabric8.dockerUser>
<docker.image>${fabric8.dockerUser}quickstart-karaf-camelrest:${project.version}</docker.image>
<docker.assemblyDescriptor>${basedir}/src/main/fabric8/assembly.xml</docker.assemblyDescriptor>
Expand Down
2 changes: 1 addition & 1 deletion quickstart/karaf/cxf-rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<karaf.version>2.4.3</karaf.version>
<karaf.plugin.version>4.0.3</karaf.plugin.version>

<docker.from>fabric8/s2i-karaf:1.2.5</docker.from>
<docker.from>fabric8/s2i-karaf:1.2.8</docker.from>
<fabric8.dockerUser>fabric8/</fabric8.dockerUser>
<docker.image>${fabric8.dockerUser}${project.artifactId}:${project.version}</docker.image>
<docker.assemblyDescriptor>${basedir}/src/main/fabric8/assembly.xml</docker.assemblyDescriptor>
Expand Down
2 changes: 1 addition & 1 deletion sandbox/quickstarts/activemq/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<spring-boot-plugin.version>1.2.7.RELEASE</spring-boot-plugin.version>

<!-- Docker & Fabric8 Configs -->
<docker.from>fabric8/s2i-java:1.2.5</docker.from>
<docker.from>fabric8/s2i-java:1.2.8</docker.from>
<fabric8.dockerUser>fabric8/</fabric8.dockerUser>
<docker.image>${fabric8.dockerUser}${project.artifactId}:${project.version}</docker.image>

Expand Down
2 changes: 1 addition & 1 deletion sandbox/quickstarts/jgroups-greeter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<docker.maven.plugin.version>0.13.6</docker.maven.plugin.version>

<!-- Docker & Fabric8 Configs -->
<docker.from>fabric8/s2i-java:1.2.5</docker.from>
<docker.from>fabric8/s2i-java:1.2.8</docker.from>
<fabric8.dockerUser>fabric8/</fabric8.dockerUser>
<docker.image>${fabric8.dockerUser}${project.artifactId}:${project.version}</docker.image>
<jgroups.port>7800</jgroups.port>
Expand Down
2 changes: 1 addition & 1 deletion sandbox/quickstarts/keycloak/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<keycloak.version>1.1.0.Beta2</keycloak.version>

<!-- Docker & Fabric8 Configs -->
<docker.from>fabric8/s2i-java:1.2.5</docker.from>
<docker.from>fabric8/s2i-java:1.2.8</docker.from>
<fabric8.dockerUser>fabric8/</fabric8.dockerUser>
<docker.image>${fabric8.dockerUser}${project.artifactId}:${project.version}</docker.image>

Expand Down

0 comments on commit 02dce6e

Please sign in to comment.