feat: install cloud SQL proxy via a shell file

savannahghi · Jul 12, 2021 · f03d578 · f03d578
1 parent 8a02b33
commit f03d578
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -82,7 +82,9 @@ RUN chown django:django ${APP_HOME}
 USER django
 
 # set up cloud SQL proxy
-RUN wget "https://storage.googleapis.com/cloudsql-proxy/v1.23.0/cloud_sql_proxy.linux.amd64" -O /cloud_sql_proxy
-RUN chmod +x /cloud_sql_proxy
+COPY --chown=django:django ./install_cloudsql_proxy.sh /install_cloudsql_proxy.sh
+RUN sed -i 's/\r$//g' /install_cloudsql_proxy.sh
+RUN chmod +x /install_cloudsql_proxy.sh
+RUN /install_cloudsql_proxy.sh
 
 ENTRYPOINT ["/entrypoint"]
diff --git a/install_cloudsql_proxy.sh b/install_cloudsql_proxy.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -o errexit
+set -o pipefail
+set -o nounset
+
+if [ -z "${CLOUD_SQL_PROXY_VERSION}" ]; then
+    export CLOUD_SQL_PROXY_VERSION=v1.23.0
+fi
+
+wget https://storage.googleapis.com/cloudsql-proxy/$CLOUD_SQL_PROXY_VERSION/cloud_sql_proxy.linux.amd64 -O /cloud_sql_proxy
+chmod +x /cloud_sql_proxy
+
+echo "Installed CloudSQL Proxy, version $CLOUD_SQL_PROXY_VERSION..."