fix: install wget in runtime container

.gitignore

@@ -324,15 +324,12 @@ tags
 ### Project template
 
 pepfar_mle/media/
-
 .pytest_cache/
-
-
 .ipython/
 .env
 .envs/*
 !.envs/.local/
-
+local.sh
 secrets/*
 cloud_sql_proxy
 

Dockerfile

@@ -21,7 +21,7 @@ ARG BUILD_ENVIRONMENT=production
 # Install apt packages
 RUN apt-get update && apt-get install --no-install-recommends -y \
   # dependencies for building Python packages
-  build-essential \
+  build-essential wget \
   # psycopg2 dependencies
   libpq-dev
 
@@ -55,6 +55,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   libpq-dev \
   # Translations dependencies
   gettext \
+  # wget
+  wget \
   # cleaning up unused files
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
   && rm -rf /var/lib/apt/lists/*
@@ -78,4 +80,10 @@ COPY --from=client-builder --chown=django:django ${APP_HOME} ${APP_HOME}
 # make django owner of the WORKDIR directory as well.
 RUN chown django:django ${APP_HOME}
 USER django
+
+# set up cloud SQL proxy
+ENV CLOUD_SQL_PROXY_VERSION v1.23.0
+RUN wget "https://storage.googleapis.com/cloudsql-proxy/${CLOUD_SQL_PROXY_VERSION}/cloud_sql_proxy.linux.amd64" -O /cloud_sql_proxy
+RUN chmod +x /cloud_sql_proxy
+
 ENTRYPOINT ["/entrypoint"]

entrypoint

@@ -4,14 +4,9 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-# set up Cloud SQL proxy
-if [ -z "${CLOUD_SQL_PROXY_VERSION}" ]; then
-    export CLOUD_SQL_PROXY_VERSION=v1.23.0 # see https://github.com/GoogleCloudPlatform/cloudsql-proxy/releases
-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
-cloud_sql_proxy -verbose -structured_logs -dir=/cloudsql -instances=$INSTANCE_CONNECTION_NAME & # run in the background!
-sleep 10 # allow time for the proxy to start
+# run in the background and allow it some time to start before continuing
+/cloud_sql_proxy -verbose -structured_logs -dir=/cloudsql -instances=$INSTANCE_CONNECTION_NAME &
+sleep 10
 echo "Created Cloud SQL Proxy at $INSTANCE_CONNECTION_NAME, running in the background"
 
 if [ -z "${POSTGRES_USER}" ]; then

requirements/production.txt

@@ -1,6 +1,6 @@
 # PRECAUTION: avoid production dependencies that aren't in development
 
--r base.txt
+-r local.txt
 
 gunicorn~=20.1.0  # https://github.com/benoitc/gunicorn
 psycopg2~=2.9.1  # https://github.com/psycopg/psycopg2