fix gcloud command (#121)

Jenkinsfile

@@ -122,7 +122,6 @@ node('master') {
       stage('Unit / Integration Tests') {
         ws {
           def success = true
-          checkoutSourceCode()
           updatePresubmit('run')
           try {
             presubmit(buildNodeLabel)

docker/ingress/build.sh

@@ -43,4 +43,4 @@ cp $DEB                                 $ROOT/docker/ingress
 cp $ROOT/bazel-bin/test/src/ingress     $ROOT/docker/ingress
 cp $ROOT/test/src/controller/nginx.tmpl $ROOT/docker/ingress
 docker build -t ${IMAGE} $ROOT/docker/ingress || error_exit "Failed to build"
-gcloud docker push ${IMAGE}                   || error_exit "Failed to upload docker image"
+gcloud docker -- push ${IMAGE}                   || error_exit "Failed to upload docker image"

script/jenkins-build-docker-slave

@@ -43,7 +43,7 @@ TOOLS_BUCKET=''
 function update_image() {
   local image="${1}"
   [[ ${FORCE} == true ]] && return 0
-  ${GCLOUD} docker pull "${image}"
+  ${GCLOUD} docker -- pull "${image}"
   local image_exists=${?}
   [[ ${image_exists} -eq 0 ]] && return 1
   return 0
@@ -75,7 +75,7 @@ if [[ "${BUILD}" == true ]]; then
     run retry -n 10 docker build --build-arg TOOLS_BUCKET="${TOOLS_BUCKET}" --no-cache -t ${IMAGE} \
       -f "${DOCKER_FILE}" . || error_exit "Could not build ${SLAVE}"
     echo "Pushing Docker image: ${IMAGE}"
-    retry -n 3 ${GCLOUD} docker push "${IMAGE}" \
+    retry -n 3 ${GCLOUD} docker -- push "${IMAGE}" \
       || error_exit "Failed to push tag ${IMAGE}."
   fi
 fi
@@ -86,7 +86,7 @@ if [[ -n "${TAG}" ]]; then
   retry -n 3 docker tag "${IMAGE}" ${TAG}
 
   echo "Pushing Docker image: ${TAG}"
-  retry -n 3 ${GCLOUD} docker push "${TAG}" \
+  retry -n 3 ${GCLOUD} docker -- push "${TAG}" \
     || error_exit "Failed to push tag ${TAG}."
 fi
 

script/linux-build-docker

@@ -48,7 +48,7 @@ done
 [[ -f "${DEB}" ]] || error_exit "Cannot find Debian package ${DEB}"
 
 echo "Checking if docker image ${IMAGE} exists.."
-gcloud docker pull "${IMAGE}" \
+gcloud docker -- pull "${IMAGE}" \
   && { echo "Image ${IMAGE} already exists; skipping"; exit 0; }
 
 echo "Building Endpoints Runtime docker image."
@@ -86,14 +86,14 @@ if  [[ -n "${CONFIG}" ]]; then
 
   echo "Pushing Custom Docker image: ${IMAGE}"
   retry -n 10 -s 10 \
-      gcloud docker push "${IMAGE}" \
+      gcloud docker -- push "${IMAGE}" \
     || error_exit "Failed to upload custom Docker image to gcr."
 else
 
   echo "Pushing Docker image: ${IMAGE}"
 
   # Try 10 times, shortest wait is 10 seconds, exponential back-off.
   retry -n 10 -s 10 \
-      gcloud docker push "${IMAGE}" \
+      gcloud docker -- push "${IMAGE}" \
     || error_exit "Failed to upload Docker image to gcr."
 fi

script/release-stable

@@ -83,7 +83,7 @@ function tag_stable_image() {
 
   docker_tag_f "${image}" "${stable}"
 
-  retry "${GCLOUD}" docker push "${stable}" \
+  retry "${GCLOUD}" docker -- push "${stable}" \
     || error_exit "ERROR: failed to push '${stable}'"
 }
 

src/nginx/t/testdata/test.crt

@@ -1,17 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIICpDCCAYwCCQC0BpfyAB+QNzANBgkqhkiG9w0BAQsFADAUMRIwEAYDVQQDDAls
-b2NhbGhvc3QwHhcNMTYwMzIzMjA1NjQyWhcNMTYxMjEzMjA1NjQyWjAUMRIwEAYD
-VQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB
-mlJ6EainQY7AvMXrh0l+C6BMNxyJ7ouBdBlqiczA1bFxC5+Ysl9c0MSXwv2foJ0C
-MxO337XjCXCY18x1/iJG9NfGa6q2wcpnPRj8zkwKl93Iwpys4sSDlMFW5MjdugRu
-qpWoC50M7wvFs8j3+ab1dN4qyT7hkyDubQ8szu9ZEXammowxzB7d2Sbm7vq2uRBh
-6dNzagWQ/U15ZvI6DYh0yPz7OFxghuuTug/6LukKEWMfKPaA9fH7edfYkSnqSlxj
-rRT9ZXLKbj0HeOoHgJY8/0V1h2+/0lIXuPFwPtzJ06TM9mW4rqiKGlhoZKzeJSJN
-PjuadC4hQtWBSdSlDnBBAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAIPx41401eME
-9g7DRdfDvg7sD5Omd2sR3ym9m8OeQGvxUVKr01mwZuyMbW/HJt8kdPdftxR+ndhQ
-YdHQeWMed68OX0201Re7KYdOu3iAQRJeMVjUiHWjlPQUPncTMKsMJngGZnMjzwEf
-AflvIvN+oR+n5UEvZM3ZdNsIadu7L2DdKfCJ1RUJlgpijS/KWIf4pMvt9Yw34/59
-s8IkJXanw8FacsTkhcCR4DR6tHIrEPccdvudmk+HlsQ3c/2gyXxG+he/hMFlCwv/
-o1cYjpJEIvJdKSxHMinWpnOskSgtqU0WSVtVoS323PzfR+8V0nAEAUvDmtmIl5Qd
-MT8DjEiM5FU=
+MIIDjDCCAnQCCQCJqkPcUsmynDANBgkqhkiG9w0BAQsFADCBhzELMAkGA1UEBhMC
+VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExETAPBgNVBAcMCFNhbiBKb3NlMQ8wDQYD
+VQQKDAZHb29nbGUxDDAKBgNVBAsMA0VuZzESMBAGA1UEAwwJbG9jYWxob3N0MR0w
+GwYJKoZIhvcNAQkBFg54eHguZ29vZ2xlLmNvbTAeFw0xNjEyMTQwODMzNDhaFw0x
+NzEyMTQwODMzNDhaMIGHMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5p
+YTERMA8GA1UEBwwIU2FuIEpvc2UxDzANBgNVBAoMBkdvb2dsZTEMMAoGA1UECwwD
+RW5nMRIwEAYDVQQDDAlsb2NhbGhvc3QxHTAbBgkqhkiG9w0BCQEWDnh4eC5nb29n
+bGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnWNgUOmucyO4
+OGoFrEVl7rv1XWzd1Vpo6jrUE8UJIwucNVFe8jT0rW7V/uHkWwceO/T2kmg/bTfi
++XBGt033fdUfEzMdTUQikZ7IU4BOIk7jzoNqCR68GcGrImgpJV2I4hz1Yrm5K+k8
+sby0m/hZzGmWX9bG0HiHH2SvUGxpF3FvsMBPOFD7fBkjwZ10Yg6g5Eg/76dHAq/T
+/Ffrxi1FrRn/qsFp9LLPFBqFf1qjljGryMbAzNsvN4YcnOl48BjeBHvYNOTlvrE0
+DiItI4PJ3vUnMFeS28c7BNSaoA+c//lu9JzaiBZhxqIQK6pBmPcSlZJc2j2GyGIQ
+sPIewAUIAwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBmFeqwX0U4Q2kqMcuix+G/
+Z/MZXDLRxuNEnNluAsXzPq2IF2tgU3SJ1hG64EehQmpHaTWjkct2Vyz/uJDEuYXX
+M/mOFOsbiZ+MXLKAQQvzxYLwaqybq9WN+x3/4Y8/aaO3kBe70RhG3EQDTey4rpe1
+pvmmq5ZJhQD7jCmCIKwN1zZ7dNoH4fdS1fLJPUR5DO4NgyIlGbWGs+Uqntvk8ATa
+ZUIoXFGuUNxFYNUC4PTm3hh0tjBjgxDpHR5YJzrjk0g2XrJTPf6Ey5gUPHpvFUpd
+is7i0IwkQlhcfHLJWHDB1QOCnToa9CDhulxEzYDksI0UmcMMKw+3CmBJ/9JGdnOP
 -----END CERTIFICATE-----

src/nginx/t/testdata/test.key

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
+O2QNQ1HcHytXLRtNPA46Cwfb6iiu6kywltHM9heIBcad90mIQvhXNDUCgYEAwr0q
+jU9DIqYmsdC/dseN9Ami7irkN0ii017q4/LzlYQjViVOQorXXHQ50ftb6bkKhnA4
+QlmwjDszDReFMKehxGqfx+3kfKPkttGPabr9nPhxxfcfCHTbk+bc/N4kI0n4Nu65
+6SPdyEWKo8f7I/aWgRKzi+4QyffSgzJyNleOYlcCgYEAjNbpGx2BeervBWaIkS1Y
+66SVO7lqlh8Pupv3gQVyFwkT8MNdYPDaRhfuINZjjF72Q3w+f+115moai4IVgLvJ
+XaEXYfDmlEjsg+QR51WsmMVb0C53nMrmsIcXEDB1KzKRkT74gF0e3ctnxCoVh6DU
+xJXkc9Do4yWk+mSvwQbUNdECgYBkAO60KIsKZRaj49Ye8jV0p+oysnYF6dgsAadQ
+LfhmxLe8ymWZCGG2Cb2TlqhJqwu7pC9P620dZl0+EOEF7l/FVRf+fK0EUMnoFE+4
+dR0+GdubVN9r4U7NchX0CUO3l4nO8+Mm1ZNUAFpE5zKR8lSxrd/kMPoQLaK+Ww6J
+14a3+wKBgGPYHhT6erg+larvrk+HEREqVt91eDYjB2lSXXS370BWFbPGw9RKP+qz
+GCjZ0XcOM85m34HUpHdSOvp8SaYWlzjeVI7IVS/iy4c4e66lcwrlL7OVFKfT2Ka9
+2yt4MvpvApljcx+nT2k/DP7aVBCINqJajT7U26y8E7kNi6pJtdp0
 -----END RSA PRIVATE KEY-----

test/bookstore/linux-build-bookstore-docker

@@ -42,7 +42,7 @@ done
 [[ -n "${IMAGE}" ]] || error_exit "Specify required image argument via '-i'"
 
 echo "Checking if docker image ${IMAGE} exists.."
-gcloud docker pull "${IMAGE}" \
+gcloud docker -- pull "${IMAGE}" \
   && echo "Image ${IMAGE} already exists; skipping" \
   && exit 0
 
@@ -54,5 +54,5 @@ retry -n 3 docker build --no-cache -t ${IMAGE} \
 echo "Pushing Docker image: ${IMAGE}"
 # Try 10 times, shortest wait is 10 seconds, exponential back-off.
 retry -n 10 -s 10 \
-    gcloud docker push "${IMAGE}" \
+    gcloud docker -- push "${IMAGE}" \
   || error_exit "Failed to upload Docker image to gcr."

test/echo/docker-remote/build-docker.sh

@@ -44,7 +44,7 @@ sed "s/\${PROJECT}/${PROJECT}/" ../service.json.temp >  ./service.json
 
 ${GCLOUD} docker -- build --no-cache -t ${TAG} .
 docker tag -f ${TAG} gcr.io/${PROJECT}/${TAG}
-${GCLOUD} docker push gcr.io/${PROJECT}/${TAG}
+${GCLOUD} docker -- push gcr.io/${PROJECT}/${TAG}
 
 rm service.json
 

test/echo/docker/build-docker.sh

@@ -44,7 +44,7 @@ sed "s/\${PROJECT}/${PROJECT}/" ../service.json.temp >  ./service.json
 
 docker build --no-cache -t ${TAG} .
 docker tag -f ${TAG} gcr.io/${PROJECT}/${TAG}
-${GCLOUD} docker push gcr.io/${PROJECT}/${TAG}
+${GCLOUD} docker -- push gcr.io/${PROJECT}/${TAG}
 
 rm service.json
 

test/grpc/Dockerfile.temp

@@ -7,7 +7,7 @@
 # 2) cp bazel-bin/test/grpc/grpc-test-server test/grpc
 # 3) IMAGE=gcr.io/endpointsv2/grpc-test-server:latest
 # 4) docker build --no-cache -t "${IMAGE}" test/grpc
-# 5) gcloud docker push "${IMAGE}"
+# 5) gcloud docker -- push "${IMAGE}"
 
 FROM debian:jessie
 

test/grpc/linux-build-grpc-docker

@@ -55,7 +55,7 @@ done
 [[ -n "${IMAGE}" ]] || error_exit "Specify required image argument via '-i'"
 
 echo "Checking if docker image ${IMAGE} exists.."
-gcloud docker pull "${IMAGE}" \
+gcloud docker -- pull "${IMAGE}" \
   && { echo "Image ${IMAGE} already exists; skipping"; exit 0; }
 
 BAZEL_TARGET="${ROOT}/bazel-bin/test/grpc/${TEST_SERVER_BIN}"
@@ -80,5 +80,5 @@ retry -n 3 docker build --no-cache -t "${IMAGE}" \
 echo "Pushing Docker image: ${IMAGE}"
 # Try 10 times, shortest wait is 10 seconds, exponential back-off.
 retry -n 10 -s 10 \
-    gcloud docker push "${IMAGE}" \
+    gcloud docker -- push "${IMAGE}" \
   || error_exit "Failed to upload Docker image to gcr."

test/transcoding/Dockerfile

@@ -8,7 +8,7 @@
 # 2) cp bazel-bin/test/transcoding/bookstore-server test/transcoding
 # 3) IMAGE=gcr.io/endpointsv2/bookstore-grpc:latest
 # 4) docker build --no-cache -t "${IMAGE}" test/transcoding
-# 5) gcloud docker push "${IMAGE}"
+# 5) gcloud docker -- push "${IMAGE}"
 
 FROM debian:jessie