Fix: database container

.gitignore

@@ -0,0 +1,2 @@
+# Credentials
+application_default_credentials.json

README.md

@@ -18,12 +18,16 @@ A Python http server built with [Django](https://www.djangoproject.com/) + [DRF]
 
 # Build
 
-Create secret files:
+Add a application_default_credentials.json file in the root of the project. To do so, follow the "Configure ADC with your Google Account" in the [link](https://cloud.google.com/docs/authentication/provide-credentials-adc#google-idp <https://cloud.google.com/docs/authentication/)provide-credentials-adc#google-idp>). Then, find the `application_default_credentials.json` on `home/.config/gcloud` and copy its content to the file you created.
+
+Create secret files and add your password to playground_kcidb:
 ```sh
 mkdir -p backend/runtime/secrets
 uuidgen > backend/runtime/secrets/postgres_password_secret
 ```
 
+If necessary, change the DB_DEFAULT_USER in the `backend/utils/entrypoint.sh` file.
+
 Startup the services with
  ```sh
  docker compose up --build -d

backend/utils/docker/entrypoint.sh

@@ -30,14 +30,14 @@ file_env DB_DEFAULT_PASSWORD
 
 export DB_DEFAULT="{
     \"ENGINE\": \"${DB_DEFAULT_ENGINE:=django.db.backends.postgresql}\",
-    \"NAME\": \"${DB_DEFAULT_NAME:=kernelci}\",
+    \"NAME\": \"${DB_DEFAULT_NAME:=playground_kcidb}\",
     \"USER\": \"${DB_DEFAULT_USER:=kernelci}\",
     \"PASSWORD\": \"$DB_DEFAULT_PASSWORD\",
-    \"HOST\": \"${DB_DEFAULT_HOST:=db}\",
+    \"HOST\": \"${DB_DEFAULT_HOST:=cloudsql-proxy}\",
     \"PORT\": \"${DB_DEFAULT_PORT:=5432}\",
     \"CONN_MAX_AGE\": ${DB_DEAFULT_CONN_MAX_AGE:=null},
     \"OPTIONS\": {
-      \"connect_timeout\": ${DB_DEFAULT_TIMEOUT:=2}
+      \"connect_timeout\": ${DB_DEFAULT_TIMEOUT:=16}
     }
 }"
 

docker-compose.yml

@@ -12,23 +12,16 @@ secrets:
         file: ./backend/runtime/secrets/postgres_password_secret
 
 services:
-    db:
-        image: postgres:16.3-alpine
+    cloudsql-proxy:
+        image: gcr.io/cloudsql-docker/gce-proxy:latest
+        command: /cloud_sql_proxy --dir=/cloudsql -instances=kernelci-production:us-central1:postgresql2=tcp:0.0.0.0:5432 -credential_file=/secrets/cloudsql/application_default_credentials.json
+        ports:
+            - 5432:5432
+        volumes:
+            - ./application_default_credentials.json:/secrets/cloudsql/application_default_credentials.json
         networks:
             - private
-        environment:
-            - POSTGRES_USER=kernelci
-            - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password_secret
-            - PGDATA=/var/run/postgresql/data
-        volumes:
-            - db-data:/var/run/postgresql/data
-        ports:
-            - target: 5432
-              published: 5432
-              protocol: tcp
-              mode: host
-        secrets:
-            - postgres_password_secret
+        restart: always
 
     backend:
         build: ./backend
@@ -41,16 +34,17 @@ services:
               published: 8000
               protocol: tcp
               mode: host
+        depends_on:
+            - cloudsql-proxy
         secrets:
             - postgres_password_secret
         environment:
-            - 'ALLOWED_HOSTS=["backend"]'
+            - 'ALLOWED_HOSTS=["backend", "localhost"]'
             - DB_DEFAULT_PASSWORD_FILE=/run/secrets/postgres_password_secret
-            - DB_DEFAULT_HOST=db
+            - DB_DEFAULT_HOST=cloudsql-proxy
 
     dashboard:
         build: ./dashboard
-        restart: always
         image: dashboard:latest
 
     collect_static:
@@ -66,6 +60,7 @@ services:
         restart: always
         depends_on:
             - backend
+            - collect_static
         networks:
             - public
         volumes: