[GitHub] csantanapr closed pull request #116: reorg docker files to enable publishing multiple official images

[GitBox <gi...@apache.org>]

csantanapr closed pull request #116: reorg docker files to enable publishing multiple official images
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/116
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/.travis.yml b/.travis.yml
index c8587e5..7619d6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,7 @@ script:
 
 deploy:
 - provider: script
-  script: "./tools/travis/publish.sh openwhisk kube-couchdb latest"
+  script:
+    - ./tools/travis/publish.sh openwhisk kube-couchdb latest docker/couchdb
   on:
     branch: master
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 0000000..de340f7
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,15 @@
+This directory contains the Dockerfiles and other artifacts to
+build specialized docker images for deploying OpenWhisk to Kubernetes.
+
+Some of the images are built automatically and published
+to DockerHub under the openwhisk userid.  Docker images are
+published on all successful Travis CI builds of the master branch.
+The built images are:
+  * couchdb - creates and initializes a CouchDB instance for
+    dev/testing of OpenWhisk.  This image is not intended for
+    production usage.
+
+The nginx and kafka images are not officially built and published
+because they are considered to be temporary.  We are working on
+eliminating the need for these images by changing the upstream
+core OpenWhisk project.
diff --git a/kubernetes/couchdb/docker/Dockerfile b/docker/couchdb/Dockerfile
similarity index 100%
rename from kubernetes/couchdb/docker/Dockerfile
rename to docker/couchdb/Dockerfile
diff --git a/kubernetes/couchdb/docker/init.sh b/docker/couchdb/init.sh
similarity index 100%
rename from kubernetes/couchdb/docker/init.sh
rename to docker/couchdb/init.sh
diff --git a/kubernetes/kafka/docker/Dockerfile b/docker/kafka/Dockerfile
similarity index 100%
rename from kubernetes/kafka/docker/Dockerfile
rename to docker/kafka/Dockerfile
diff --git a/kubernetes/kafka/docker/init.sh b/docker/kafka/init.sh
similarity index 100%
rename from kubernetes/kafka/docker/init.sh
rename to docker/kafka/init.sh
diff --git a/kubernetes/nginx/docker/Dockerfile b/docker/nginx/Dockerfile
similarity index 100%
rename from kubernetes/nginx/docker/Dockerfile
rename to docker/nginx/Dockerfile
diff --git a/docker/nginx/README.md b/docker/nginx/README.md
new file mode 100644
index 0000000..cecce14
--- /dev/null
+++ b/docker/nginx/README.md
@@ -0,0 +1,24 @@
+# Create Nginx Docker Image
+
+We currently deploy a custom Nginx docker image that includes the
+OpenWhisk CLI and other downloadable artifacts. Once there are proper
+releases of these artifacts, we can switch to using a standard Nginx
+image and redirect to the official release archives for the artifacts
+we are currently storing in the custom docker image.  See the GitHub
+[issue](https://github.com/openwhisk/openwhisk/issues/2152).
+
+To build the Nginx docker image for Kubernetes on OpenWhisk,
+you will need to run the build script [build.sh](docker/build.sh).
+This script requires one parameter, which is the repo to bush
+the Docker image to.
+
+E.G
+```
+docker/builds.sh <danlavine>
+```
+
+This script goes through and donwload the OpenWhisk repo under the
+tmp directory, builds the Blackbox image and copies it into the
+Docker image.  Then, each of the published WSK CLIs are download into
+the Docker image so that users are able to download them as usual.
+
diff --git a/kubernetes/nginx/docker/build.sh b/docker/nginx/build.sh
similarity index 100%
rename from kubernetes/nginx/docker/build.sh
rename to docker/nginx/build.sh
diff --git a/kubernetes/nginx/README.md b/kubernetes/nginx/README.md
index e0ae9d6..91b36eb 100644
--- a/kubernetes/nginx/README.md
+++ b/kubernetes/nginx/README.md
@@ -105,27 +105,3 @@ Kubernetes will then go through an update any deployed Nginx
 instances. Updating all of the keys defined in the nginx
 Secrets.
 
-# Create Nginx Docker Image
-
-We currently deploy a custom Nginx docker image that includes the
-OpenWhisk CLI and other downloadable artifacts. Once there are proper
-releases of these artifacts, we can switch to using a standard Nginx
-image and redirect to the official release archives for the artifacts
-we are currently storing in the custom docker image.  See the GitHub
-[issue](https://github.com/openwhisk/openwhisk/issues/2152).
-
-To build the Nginx docker image for Kubernetes on OpenWhisk,
-you will need to run the build script [build.sh](docker/build.sh).
-This script requires one parameter, which is the repo to bush
-the Docker image to.
-
-E.G
-```
-docker/builds.sh <danlavine>
-```
-
-This script goes through and donwload the OpenWhisk repo under the
-tmp directory, builds the Blackbox image and copies it into the
-Docker image.  Then, each of the published WSK CLIs are download into
-the Docker image so that users are able to download them as usual.
-
diff --git a/tools/travis/publish.sh b/tools/travis/publish.sh
index 9eb899f..d6e4ec0 100755
--- a/tools/travis/publish.sh
+++ b/tools/travis/publish.sh
@@ -4,8 +4,9 @@ set -exu
 dockerhub_image_prefix="$1"
 dockerhub_image_name="$2"
 dockerhub_image_tag="$3"
+dir_to_build="$4"
 dockerhub_image="${dockerhub_image_prefix}/${dockerhub_image_name}:${dockerhub_image_tag}"
 
 docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
-docker build kubernetes/couchdb/docker --tag ${dockerhub_image}
+docker build ${dir_to_build} --tag ${dockerhub_image}
 docker push ${dockerhub_image}


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services