Merge pull request #63 from rhuss/master

Pinning version of run-java-sh and agent-bond
fabric8io-images · Jan 13, 2017 · 7107ffa · 7107ffa
2 parents 9f35952 + 87cdb95
commit 7107ffa
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/java/fish-pepper.yml b/java/fish-pepper.yml
@@ -11,6 +11,12 @@ fish-pepper:
 # External blocks
 blocks:
   # run-java.sh for starting up Java processes
-  - "https://github.com/fabric8io/run-java-sh.git"
+  - type: "git"
+    url: "https://github.com/fabric8io/run-java-sh.git"
+    path: "fish-pepper"
+    tag: "v1.0.0"
   # jolokia integration taken from agent-bond
-  - "https://github.com/fabric8io/agent-bond.git"
+  - type: "git"
+    url: "https://github.com/fabric8io/agent-bond.git"
+    path: "fish-pepper"
+    tag: "v1.0.0"
diff --git a/java/images.yml b/java/images.yml
@@ -3,7 +3,7 @@ fish-pepper:
   params:
     - base
   name: "fabric8/s2i-java"
-  build: "1.3.6"
+  build: "2.0.0"
 
 # Used for escaping in 'agent-bond-opts' where the same delimiters are used
 abSepOpen: "{{"

diff --git a/karaf/fish-pepper.yml b/karaf/fish-pepper.yml
@@ -11,6 +11,12 @@ fish-pepper:
 # External blocks
 blocks:
   # run-java.sh for starting up Java processes
-  - "https://github.com/fabric8io/run-java-sh.git"
+  - type: "git"
+    url: "https://github.com/fabric8io/run-java-sh.git"
+    path: "fish-pepper"
+    tag: "v1.0.0"
   # jolokia integration taken from agent-bond
-  - "https://github.com/fabric8io/agent-bond.git"
+  - type: "git"
+    url: "https://github.com/fabric8io/agent-bond.git"
+    path: "fish-pepper"
+    tag: "v1.0.0"
diff --git a/karaf/images.yml b/karaf/images.yml
@@ -3,7 +3,7 @@ fish-pepper:
   params:
     - base
   name: "fabric8/s2i-karaf"
-  build: "1.3.6"
+  build: "2.0.0"
 
 # Used for escaping in 'agent-bond-opts' where the same delimiters are used
 abSepOpen: "{{"