add PostgreSQL in docker-compose deployments (mljar#75)

docker-compose-pro.yml

@@ -54,7 +54,25 @@ services:
             EMAIL_HOST_PASSWORD: ${EMAIL_HOST_PASSWORD}
             EMAIL_PORT: ${EMAIL_PORT} 
             DEFAULT_FROM_EMAIL: ${DEFAULT_FROM_EMAIL}
+            DJANGO_DB: postgresql
+            POSTGRES_HOST: db
+            POSTGRES_NAME: postgres
+            POSTGRES_USER: postgres
+            POSTGRES_PASSWORD: postgres
+            POSTGRES_PORT: 5432
+        depends_on:
+            - db
+    db:
+        image: postgres:13.0-alpine
+        restart: unless-stopped
+        volumes:
+            - postgres_data:/var/lib/postgresql/data/
+        environment:
+            POSTGRES_DB: postgres
+            POSTGRES_USER: postgres
+            POSTGRES_PASSWORD: postgres
 
 volumes:
     static_volume: {}
-    media_volume: {}
+    media_volume: {}
+    postgres_data: {}

docker-compose.yml

@@ -41,6 +41,25 @@ services:
             EMAIL_HOST_PASSWORD: ${EMAIL_HOST_PASSWORD}
             EMAIL_PORT: ${EMAIL_PORT} 
             DEFAULT_FROM_EMAIL: ${DEFAULT_FROM_EMAIL}
+            DJANGO_DB: postgresql
+            POSTGRES_HOST: db
+            POSTGRES_NAME: postgres
+            POSTGRES_USER: postgres
+            POSTGRES_PASSWORD: postgres
+            POSTGRES_PORT: 5432
+        depends_on:
+            - db
+    db:
+        image: postgres:13.0-alpine
+        restart: unless-stopped
+        volumes:
+            - postgres_data:/var/lib/postgresql/data/
+        environment:
+            POSTGRES_DB: postgres
+            POSTGRES_USER: postgres
+            POSTGRES_PASSWORD: postgres
+
 volumes:
     static_volume: {}
-    media_volume: {}
+    media_volume: {}
+    postgres_data: {}

docker/mercury/Dockerfile

@@ -10,7 +10,8 @@ RUN apt-get update && \
             libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 \
             libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 \ 
             lsb-release xdg-utils wget libcairo-gobject2 libxinerama1 libgtk2.0-0 libpangoft2-1.0-0 libthai0 libpixman-1-0 \ 
-            libxcb-render0 libharfbuzz0b libdatrie1 libgraphite2-3 libgbm1
+            libxcb-render0 libharfbuzz0b libdatrie1 libgraphite2-3 libgbm1 \
+            libpq-dev
 
 
 WORKDIR /app
@@ -19,6 +20,7 @@ ADD ./mercury/requirements.txt /app/mercury/
 RUN pip install --upgrade pip
 RUN pip install gunicorn
 RUN pip install -r mercury/requirements.txt
+RUN pip install psycopg2 
 
 # install Pro features if GITHUB_TOKEN is set
 RUN if [ -z "${GITHUB_TOKEN}" ] ; then \

docker/mercury/entrypoint.sh

@@ -5,9 +5,6 @@ do
     echo "Waiting for server volume..."
 done
 
-# clear old data dbs
-rm *.sqlite
-rm *.sqlite3
 
 until python manage.py migrate
 do

mercury/server/settings.py

@@ -169,13 +169,26 @@
 # Database
 # https://docs.djangoproject.com/en/3.2/ref/settings/#databases
 
-DATABASES = {
-    "default": {
+DB_SQLITE = "sqlite"
+DB_POSTGRESQL = "postgresql"
+
+DATABASES_ALL = {
+    DB_SQLITE: {
         "ENGINE": "django.db.backends.sqlite3",
         "NAME": BASE_DIR / "db.sqlite3",
-    }
+    },
+    DB_POSTGRESQL: {
+        "ENGINE": "django.db.backends.postgresql",
+        "HOST": os.environ.get("POSTGRES_HOST", "localhost"),
+        "NAME": os.environ.get("POSTGRES_NAME", "postgres"),
+        "USER": os.environ.get("POSTGRES_USER", "postgres"),
+        "PASSWORD": os.environ.get("POSTGRES_PASSWORD", "postgres"),
+        "PORT": int(os.environ.get("POSTGRES_PORT", "5432")),
+    },
 }
 
+DATABASES = {"default": DATABASES_ALL[os.environ.get("DJANGO_DB", DB_SQLITE)]}
+
 
 # Password validation
 # https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators