From b48c0d10ead57a3879b672b90026176a5cc76d29 Mon Sep 17 00:00:00 2001
From: Ismail Khoffi <ismailkhoffi@google.com>
Date: Tue, 20 Jun 2017 19:05:35 +0100
Subject: [PATCH] Add .dockerignore file, move gcloud auth command to travis
 (#622)

---
 .dockerignore     | 4 ++++
 .travis.yml       | 2 ++
 scripts/deploy.sh | 1 -
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..319e1377e
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+# exclude top-level credential files:
+/service_key.json
+/client_secret*.json
+/travis_secrets.tar.gz
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 45c982b22..ede50cd48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,6 +47,8 @@ before_deploy:
     curl https://sdk.cloud.google.com | bash; fi
   - openssl aes-256-cbc -K $encrypted_a1eb99cfc21e_key -iv $encrypted_a1eb99cfc21e_iv -in travis_secrets.tar.gz.enc -out travis_secrets.tar.gz -d
   - tar -xzf travis_secrets.tar.gz
+  - gcloud auth activate-service-account --key-file service_key.json
+  - rm -f service_key.json
   - gcloud --quiet version
   - sudo gcloud --quiet components update kubectl
 
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 653c4d22b..6f07593ed 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -37,7 +37,6 @@ function main()
 
 function initGcloud()
 {
-  gcloud auth activate-service-account --key-file service_key.json
   gcloud config set project ${PROJECT_NAME}
   gcloud config set compute/zone us-central1-a
   gcloud container clusters get-credentials ci-cluster