Push to Quay.io

Also refactors the `publish.sh` script to make it easier to run locally.

Author: daniel-ac-martin

.drone.yml

@@ -14,8 +14,27 @@ pipeline:
     image: docker:1.11
     environment:
       - DOCKER_HOST=tcp://127.0.0.1:2375
+      - DOCKER_IMAGE=nginx-proxy
+      - DOCKER_REPO=artifactory-internal.digital.homeoffice.gov.uk
+      - DOCKER_BASEDIR=/
+      - DOCKER_USERNAME=lev-web-robot
     commands:
-      - ./publish.sh
+      - docker login -u="${DOCKER_USERNAME}" -p="${DOCKER_PASSWORD}" "${DOCKER_REPO}"
+      - ./publish.sh "ngx" "${DOCKER_REPO}${DOCKER_BASEDIR}${DOCKER_IMAGE}" "${DRONE_TAG}"
+    when:
+      event: tag
+
+  push_image_to_quay:
+    image: docker:1.11
+    environment:
+      - DOCKER_HOST=tcp://127.0.0.1:2375
+      - DOCKER_IMAGE=nginx-proxy
+      - DOCKER_REPO=quay.io
+      - DOCKER_BASEDIR=/ukhomeofficedigital/
+      - DOCKER_USERNAME=ukhomeofficedigital+lev_builder
+    commands:
+      - docker login -u="${DOCKER_USERNAME}" -p="${DOCKER_QUAY_PASSWORD}" "${DOCKER_REPO}"
+      - ./publish.sh "ngx" "${DOCKER_REPO}${DOCKER_BASEDIR}${DOCKER_IMAGE}" "${DRONE_TAG}"
     when:
       event: tag
 

.drone.yml.sig

@@ -1 +1 @@
-eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CgogIGJ1aWxkX2ltYWdlOgogICAgaW1hZ2U6IHF1YXkuaW8vdWtob21lb2ZmaWNlZGlnaXRhbC9jZW50b3MtYmFzZTpsYXRlc3QKICAgIGVudmlyb25tZW50OgogICAgICAtIERPQ0tFUl9IT1NUPXRjcDovLzEyNy4wLjAuMToyMzc1CiAgICBjb21tYW5kczoKICAgICAgLSB5dW0gaW5zdGFsbCAteSAtcSBkb2NrZXIgb3BlbnNzbCB3Z2V0CiAgICAgIC0gLi9jaS1idWlsZC5zaAogICAgd2hlbjoKICAgICAgZXZlbnQ6IFtwdWxsX3JlcXVlc3QsIHB1c2gsIHRhZ10KCiAgcHVzaF9pbWFnZToKICAgIGltYWdlOiBkb2NrZXI6MS4xMQogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gRE9DS0VSX0hPU1Q9dGNwOi8vMTI3LjAuMC4xOjIzNzUKICAgIGNvbW1hbmRzOgogICAgICAtIFJFUE89ImFydGlmYWN0b3J5LWludGVybmFsLmRpZ2l0YWwuaG9tZW9mZmljZS5nb3YudWsiCiAgICAgIC0gQkFTRT0iLyIKICAgICAgLSBOQU1FPSJuZ2lueC1wcm94eSIKICAgICAgLSBGVUxMX05BTUU9IiR7UkVQT30ke0JBU0V9JHtOQU1FfSIKICAgICAgLSBET0NLRVJfVVNFUk5BTUU9Imxldi13ZWItcm9ib3QiCiAgICAgIC0gZG9ja2VyIGxvZ2luIC11PSIke0RPQ0tFUl9VU0VSTkFNRX0iIC1wPSIke0RPQ0tFUl9QQVNTV09SRH0iICIke1JFUE99IgogICAgICAtIGRvY2tlciB0YWcgbmd4ICIke0ZVTExfTkFNRX06JHtEUk9ORV9UQUd9IgogICAgICAtIGRvY2tlciB0YWcgbmd4ICIke0ZVTExfTkFNRX06bGF0ZXN0IgogICAgICAtIGRvY2tlciBwdXNoICIke0ZVTExfTkFNRX06JHtEUk9ORV9UQUd9IgogICAgICAtIGRvY2tlciBwdXNoICIke0ZVTExfTkFNRX06bGF0ZXN0IgogICAgd2hlbjoKICAgICAgZXZlbnQ6IHRhZwoKc2VydmljZXM6CiAgZGluZDoKICAgIGltYWdlOiBkb2NrZXI6MS4xMy1kaW5kCiAgICBwcml2aWxlZ2VkOiB0cnVlCiAgICBjb21tYW5kOgogICAgICAtICItcyIKICAgICAgLSAib3ZlcmxheSIK.fsCfmLyIOwFA4sTrzWETpFtSeUEgeNMFAvQhFFnONl0
+eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CgogIGJ1aWxkX2ltYWdlOgogICAgaW1hZ2U6IHF1YXkuaW8vdWtob21lb2ZmaWNlZGlnaXRhbC9jZW50b3MtYmFzZTpsYXRlc3QKICAgIGVudmlyb25tZW50OgogICAgICAtIERPQ0tFUl9IT1NUPXRjcDovLzEyNy4wLjAuMToyMzc1CiAgICBjb21tYW5kczoKICAgICAgLSB5dW0gaW5zdGFsbCAteSAtcSBkb2NrZXIgb3BlbnNzbCB3Z2V0CiAgICAgIC0gLi9jaS1idWlsZC5zaAogICAgd2hlbjoKICAgICAgZXZlbnQ6IFtwdWxsX3JlcXVlc3QsIHB1c2gsIHRhZ10KCiAgcHVzaF9pbWFnZToKICAgIGltYWdlOiBkb2NrZXI6MS4xMQogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gRE9DS0VSX0hPU1Q9dGNwOi8vMTI3LjAuMC4xOjIzNzUKICAgICAgLSBET0NLRVJfSU1BR0U9bmdpbngtcHJveHkKICAgICAgLSBET0NLRVJfUkVQTz1hcnRpZmFjdG9yeS1pbnRlcm5hbC5kaWdpdGFsLmhvbWVvZmZpY2UuZ292LnVrCiAgICAgIC0gRE9DS0VSX0JBU0VESVI9LwogICAgICAtIERPQ0tFUl9VU0VSTkFNRT1sZXYtd2ViLXJvYm90CiAgICBjb21tYW5kczoKICAgICAgLSBkb2NrZXIgbG9naW4gLXU9IiR7RE9DS0VSX1VTRVJOQU1FfSIgLXA9IiR7RE9DS0VSX1BBU1NXT1JEfSIgIiR7RE9DS0VSX1JFUE99IgogICAgICAtIC4vcHVibGlzaC5zaCAibmd4IiAiJHtET0NLRVJfUkVQT30ke0RPQ0tFUl9CQVNFRElSfSR7RE9DS0VSX0lNQUdFfSIgIiR7RFJPTkVfVEFHfSIKICAgIHdoZW46CiAgICAgIGV2ZW50OiB0YWcKCiAgcHVzaF9pbWFnZV90b19xdWF5OgogICAgaW1hZ2U6IGRvY2tlcjoxLjExCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBET0NLRVJfSE9TVD10Y3A6Ly8xMjcuMC4wLjE6MjM3NQogICAgICAtIERPQ0tFUl9JTUFHRT1uZ2lueC1wcm94eQogICAgICAtIERPQ0tFUl9SRVBPPXF1YXkuaW8KICAgICAgLSBET0NLRVJfQkFTRURJUj0vdWtob21lb2ZmaWNlZGlnaXRhbC8KICAgICAgLSBET0NLRVJfVVNFUk5BTUU9dWtob21lb2ZmaWNlZGlnaXRhbCtsZXZfYnVpbGRlcgogICAgY29tbWFuZHM6CiAgICAgIC0gZG9ja2VyIGxvZ2luIC11PSIke0RPQ0tFUl9VU0VSTkFNRX0iIC1wPSIke0RPQ0tFUl9RVUFZX1BBU1NXT1JEfSIgIiR7RE9DS0VSX1JFUE99IgogICAgICAtIC4vcHVibGlzaC5zaCAibmd4IiAiJHtET0NLRVJfUkVQT30ke0RPQ0tFUl9CQVNFRElSfSR7RE9DS0VSX0lNQUdFfSIgIiR7RFJPTkVfVEFHfSIKICAgIHdoZW46CiAgICAgIGV2ZW50OiB0YWcKCnNlcnZpY2VzOgogIGRpbmQ6CiAgICBpbWFnZTogZG9ja2VyOjEuMTMtZGluZAogICAgcHJpdmlsZWdlZDogdHJ1ZQogICAgY29tbWFuZDoKICAgICAgLSAiLXMiCiAgICAgIC0gIm92ZXJsYXkiCg.JNb59v_GkAo5TKhjpyqcHtXFhY1J6_SOzjjOeqbge9E

publish.sh

@@ -1,22 +1,47 @@
 #!/usr/bin/env bash
 
-REPO="artifactory-internal.digital.homeoffice.gov.uk"
-BASE="/"
-NAME="nginx-proxy"
-FULL_NAME="${REPO}${BASE}${NAME}"
-DOCKER_USERNAME="lev-web-robot"
+function usage {
+    cat <<EOL
+USAGE: ${0} SRC DEST VERSION
 
-PATCH="${DRONE_TAG}"
+  SRC:     The name of the local image to be published
+      e.g. my-image:my-tag
+
+  DEST:    The name to publish as minus the tag
+      e.g. quay.io/you/my-image
+
+  VERSION: The full version (to patch level) to publish as
+      e.g. v0.1.0
+EOL
+}
+
+SRC="${1}"
+DEST="${2}"
+VERSION="${3}"
+
+function check_arg {
+    if [ -z "${1}" ]; then
+        echo "Error: Missing ${2} in arguments";
+        echo
+        usage
+        exit 1;
+    fi
+}
+
+check_arg "${SRC}" "SRC"
+check_arg "${DEST}" "DEST"
+check_arg "${VERSION}" "VERSION"
+
+PATCH="${VERSION}"
 MINOR=`echo ${PATCH} | awk -F '.' '{print $1"."$2}'`
 MAJOR=`echo ${MINOR} | awk -F '.' '{print $1}'`
 
-docker login -u="${DOCKER_USERNAME}" -p="${DOCKER_PASSWORD}" "${REPO}"
-
-tag_n_push() {
-  echo "Publishing ${1} of ${NAME}..."
-  docker tag ngx "${FULL_NAME}:${1}"
-  docker push "${FULL_NAME}:${1}"
-  echo "published ${1}"
+function tag_n_push {
+    FULL_NAME="${DEST}:${1}"
+    echo -n "Publishing '${SRC}' as '${FULL_NAME}'..."
+    docker tag ngx "${FULL_NAME}"
+    docker push "${FULL_NAME}"
+    echo " done."
 }
 
 tag_n_push "${PATCH}"