From 07536e60c779c6b46b25e9e7c0c0a9e583da122d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Hu=C3=9F?= Date: Wed, 12 Oct 2016 21:17:21 +0200 Subject: [PATCH] Fix circle-ci build --- circle.yml | 2 +- java/images.yml | 2 +- karaf/images.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 32c4bd3a..3d9cdc2e 100644 --- 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 index 1d319233..15d601a2 100644 --- 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 index ad5a9b3e..6e80c5c0 100644 --- 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: "{{"