You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/02/15 06:35:52 UTC

[camel-k] branch master updated: Resolving Issue #437

This is an automated email from the ASF dual-hosted git repository.

lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git


The following commit(s) were added to refs/heads/master by this push:
     new 1648718  Resolving Issue #437
1648718 is described below

commit 1648718bbb84767b378732f0b73e889de7089090
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Feb 14 12:47:48 2019 +0100

    Resolving Issue #437
---
 contributing.adoc      | 6 ++++++
 script/Makefile        | 4 ++--
 script/images_build.sh | 2 +-
 script/images_push.sh  | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/contributing.adoc b/contributing.adoc
index b16f2e8..a614ef0 100644
--- a/contributing.adoc
+++ b/contributing.adoc
@@ -114,6 +114,12 @@ In your settings.xml you'll need to have the correct ASF credentials to push.
 
 Don't forget to first run a `make build-runtime` before pushing the snapshot
 
+The above command produces a `camel-k` image with name `docker.io/apache/camel-k`.  Sometimes you might need to produce camel-k images that need to be pushed to the custom repository e.g. `docker.io/myrepo/camel-k`, to do that you can pass a parameter `imgDestination` to the make as shown below:
+
+```
+make imgDestination='docker.io/myrepo' images
+```
+
 [[testing]]
 == Testing
 
diff --git a/script/Makefile b/script/Makefile
index 47acae6..f86bed3 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -64,10 +64,10 @@ clean:
 images: images-build
 
 images-build:
-	./script/images_build.sh
+	./script/images_build.sh $(imgDestination)
 
 images-push:
-	./script/images_push.sh
+	./script/images_push.sh $(imgDestination)
 
 install: install-minishift
 install-minishift:
diff --git a/script/images_build.sh b/script/images_build.sh
index 7aefdc2..969151a 100755
--- a/script/images_build.sh
+++ b/script/images_build.sh
@@ -3,4 +3,4 @@
 location=$(dirname $0)
 version=$($location/get_version.sh)
 
-$location/package_maven_artifacts.sh && operator-sdk build docker.io/apache/camel-k:$version
\ No newline at end of file
+$location/package_maven_artifacts.sh && operator-sdk build ${imgDestination:-'docker.io/apache/camel-k'}:$version
\ No newline at end of file
diff --git a/script/images_push.sh b/script/images_push.sh
index 2b7eab9..94d9654 100755
--- a/script/images_push.sh
+++ b/script/images_push.sh
@@ -3,4 +3,4 @@
 location=$(dirname $0)
 version=$($location/get_version.sh)
 
-docker push docker.io/apache/camel-k:$version
\ No newline at end of file
+docker push ${imgDestination:-'docker.io/apache/camel-k'}:$version
\ No newline at end of file