Merge pull request #39 from rhuss/master

Fix circle-ci build
fabric8io-images · Oct 12, 2016 · c256cf3 · c256cf3
2 parents acde46c + 07536e6
commit c256cf3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/circle.yml b/circle.yml
@@ -32,7 +32,7 @@ deployment:
       - docker push fabric8/s2i-java:${CIRCLE_TAG/#v/} | cat -
       - docker tag fabric8/s2i-java:${CIRCLE_TAG/#v/} fabric8/s2i-java:$(echo ${CIRCLE_TAG/#v/} | sed -e 's/\.[0-9][0-9]*$//')
       - docker push fabric8/s2i-java:$(echo ${CIRCLE_TAG/#v/} | sed -e 's/\.[0-9][0-9]*$//')
-      - cd karaf && ( docker build -t fabric8/s2i-karaf:${CIRCLE_TAG/#v/} . | cat - )
+      - cd karaf/images/jboss && ( docker build -t fabric8/s2i-karaf:${CIRCLE_TAG/#v/} . | cat - )
       - docker push fabric8/s2i-karaf:${CIRCLE_TAG/#v/} | cat -
       - docker tag fabric8/s2i-karaf:${CIRCLE_TAG/#v/} fabric8/s2i-karaf:$(echo ${CIRCLE_TAG/#v/} | sed -e 's/\.[0-9][0-9]*$//')
       - docker push fabric8/s2i-karaf:$(echo ${CIRCLE_TAG/#v/} | sed -e 's/\.[0-9][0-9]*$//')
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.5"
+  build: "1.3.6"
 
 # Used for escaping in 'agent-bond-opts' where the same delimiters are used
 abSepOpen: "{{"

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.5"
+  build: "1.3.6"
 
 # Used for escaping in 'agent-bond-opts' where the same delimiters are used
 abSepOpen: "{{"