Merge pull request #362 from oracle/promote-docker-hub

Build in Wercker, push for test, test, and then on success push develop to Docker Hub

Author: rjeberhard

Dockerfile

@@ -3,8 +3,8 @@
 #
 # HOW TO BUILD THIS IMAGE
 # -----------------------
-# Run: 
-#      $ docker build -t weblogic-kubernetes-operator:latest . 
+# Run:
+#      $ docker build -t weblogic-kubernetes-operator:latest .
 #
 # Pull base image
 # From the Docker store

wercker.yml

@@ -29,6 +29,10 @@ build:
     code: |
       echo "Building Oracle WebLogic Server Kubernetes Operator..."
       echo "The branch and commit id are $WERCKER_GIT_BRANCH, $WERCKER_GIT_COMMIT"
+      export IMAGE_TAG_OPERATOR="${WERCKER_GIT_BRANCH//[_\/]/-}"
+      if [ "$IMAGE_TAG_OPERATOR" = "master" ]; then
+        export IMAGE_TAG_OPERATOR="1.0"
+      fi
   - script:
     name: Install pre-reqs
     code: |
@@ -37,38 +41,26 @@ build:
     goals: clean install
     version: 3.5.2
     cache_repo: true
-  - script:
-    name: Copy built-artifacts into the image
-    code: |
-      mkdir /operator
-      mkdir /operator/lib
-      cp -R src/scripts/* /operator/
-      cp operator/target/weblogic-kubernetes-operator-1.0.jar /operator/weblogic-kubernetes-operator.jar
-      cp operator/target/lib/*.jar /operator/lib/
-      export IMAGE_TAG_OPERATOR="${IMAGE_TAG_OPERATOR:-${WERCKER_GIT_BRANCH//[_\/]/-}}"
-      if [ "$IMAGE_TAG_OPERATOR" = "develop" ]; then
-        export IMAGE_TAG_OPERATOR="latest"
-      elif [ "$IMAGE_TAG_OPERATOR" = "master" ]; then
-        export IMAGE_TAG_OPERATOR="1.0"
-      fi
-  - script:
-    name: Remove things we do not want in the Docker image in order to reduce size of image
-    code: |
-      rpm -e --nodeps tar
-      rpm -e --nodeps gzip
-      yum clean all
-      rm -rf /var/cache/yum
+  - internal/docker-build:
+    dockerfile: Dockerfile
+    image-name: $REPO_REPOSITORY:$IMAGE_TAG_OPERATOR
+    no-cache: true
+    registry-auth-config: |
+      {
+        "https://index.docker.io/v1/": {
+          "username": "${DOCKER_USERNAME}",
+          "password": "${DOCKER_PASSWORD}"
+        }
+      }
   # push the image to Docker using the GIT branch as the tag
   # this image needs to be available to the integration-test pipeline for testing
   - internal/docker-push:
+    image-name: $REPO_REPOSITORY:$IMAGE_TAG_OPERATOR
     username: $REPO_USERNAME
     password: $REPO_PASSWORD
     repository: $REPO_REPOSITORY
     registry: $REPO_REGISTRY
     tag: $IMAGE_TAG_OPERATOR
-    working-dir: "/operator"
-    cmd: "operator.sh"
-    env: "PATH=$PATH:/operator"
 
 # This pipeline runs the integration tests against a k8s cluster on OCI.
 command-timeout: 60
@@ -177,9 +169,7 @@ integration-test:
 
       export IMAGE_NAME_OPERATOR="${REPO_REPOSITORY}"
       export IMAGE_TAG_OPERATOR="${WERCKER_GIT_BRANCH//[_\/]/-}"
-      if [ "$IMAGE_TAG_OPERATOR" = "develop" ]; then
-        export IMAGE_TAG_OPERATOR="latest"
-      elif [ "$IMAGE_TAG_OPERATOR" = "master" ]; then
+      if [ "$IMAGE_TAG_OPERATOR" = "master" ]; then
         export IMAGE_TAG_OPERATOR="1.0"
       fi
       export IMAGE_PULL_POLICY_OPERATOR="Always"
@@ -277,9 +267,7 @@ integration-test-java:
 
       export IMAGE_NAME_OPERATOR="${REPO_REPOSITORY}"
       export IMAGE_TAG_OPERATOR="${WERCKER_GIT_BRANCH//[_\/]/-}"
-      if [ "$IMAGE_TAG_OPERATOR" = "develop" ]; then
-        export IMAGE_TAG_OPERATOR="latest"
-      elif [ "$IMAGE_TAG_OPERATOR" = "master" ]; then
+      if [ "$IMAGE_TAG_OPERATOR" = "master" ]; then
         export IMAGE_TAG_OPERATOR="1.0"
       fi
       export IMAGE_PULL_POLICY_OPERATOR="Always"
@@ -330,8 +318,9 @@ quality:
 promote-image:
   steps:
   - internal/docker-push:
-    username: $REPO_USERNAME
-    password: $REPO_PASSWORD
+    image-name: $REPO_REPOSITORY:$IMAGE_TAG_OPERATOR
+    username: $DOCKER_USERNAME
+    password: $DOCKER_PASSWORD
     repository: oracle/weblogic-kubernetes-operator
     tag: $IMAGE_TAG_OPERATOR