Add google-api-client installation.

Enable /etc/profile usage for template variables
Fix template variables names.

Author: Alexander Bondarev

9.6/Dockerfile

@@ -47,6 +47,8 @@ RUN curl -L -o /usr/local/bin/confd https://github.com/kelseyhightower/confd/rel
 ENV PGHOARD_VERSION=1.5.0
 RUN pip3 install git+https://github.com/ohmu/pghoard.git@${PGHOARD_VERSION}
 
+RUN pip3 install google-api-python-client 'oauth2client<4'
+
 RUN mkdir /var/lib/pghoard
 RUN chown postgres:postgres /var/lib/pghoard
 

9.6/docker-entrypoint.sh

@@ -2,6 +2,8 @@
 
 set -e
 
+source /etc/profile
+
 echo "Create pghoard directories..."
 chown -R postgres /home/postgres
 

9.6/templates/pghoard.json.tmpl

@@ -38,11 +38,11 @@
             "is_secure": "{{getenv "AWS_IS_SECURE"}}",
             {{end}}
             "bucket_name":"{{getenv "AWS_BUCKETNAME"}}"
-	 {{else if eq $storage_type "google"}}
-	    "storage_type": "google",
-	    "project_id": "{{getenv "GCE_PROJECT_ID"}}",
-	    "bucket_name": "{{getenv "GCE_BUCKET_NAME"}}",
-	    "credential_file": "{{getenv "GCE_CREDENTIAL_FILE"}}"
+	       {{else if eq $storage_type "google"}}
+	          "storage_type": "google",
+	          "bucket_name": "{{getenv "GCS_BUCKET_NAME"}}",
+	          "project_id": "{{getenv "GCE_PROJECT_ID"}}",
+	          "credential_file": "{{getenv "GCE_CREDENTIAL_FILE"}}"
          {{else if eq $storage_type "swift"}}
             "storage_type": "swift",
             "user":"{{getenv "OS_USERNAME"}}",