WR-38: Changed docker config

Author: phpusr

.gitignore

@@ -1,5 +1,7 @@
 /.idea/
 /*.iml
 
+/data/
 /.coverage_html/
-/.coverage
+/.coverage
+/.env

Dockerfile

@@ -1,5 +1,4 @@
 FROM python:3.8
-MAINTAINER phpusr
 
 ENV PYTHONBUFFERED 1
 ENV PORT 8000
@@ -8,13 +7,12 @@ ENV DEBUG False
 WORKDIR /app/
 
 # Install dependencies
-COPY Pipfile Pipfile.lock ./
+COPY Pipfile.lock ./
 RUN pip install --upgrade pipenv \
-    && pipenv lock --requirements > requirements.txt \
+    && pipenv requirements > requirements.txt \
     && pip install -r requirements.txt \
-    && pipenv --rm \
     && pip uninstall -y pipenv \
-    && rm Pipfile Pipfile.lock requirements.txt
+    && rm Pipfile.lock requirements.txt
 
 # Add user
 RUN useradd user

backend/app/services/backup_service.py

@@ -20,7 +20,7 @@
 with open(enc_service_account_file_path) as enc_file:
     gdrive_account_data = signing.loads(enc_file.read())
 
-service_account_file_path = os.path.join(settings.BASE_DIR, 'gdrive_account.json')
+service_account_file_path = os.path.join('/tmp', 'gdrive_account.json')
 with open(service_account_file_path, 'w') as service_account_file:
     json.dump(gdrive_account_data, service_account_file)
 

docker-compose.yml

@@ -7,13 +7,17 @@ services:
     image: phpusr/wildrace
     restart: unless-stopped
     ports:
-      - 8010:8000
+      - ${PORT:-8010}:8000
     environment:
       - DEBUG=False
       - APP_LOG_LEVEL=DEBUG
-      - PORT=8000
-      - DATABASE_URL=postgres://postgres:mysuperpassword@db:5432/app
+      - DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/app
       - REDIS_URL=redis://redis:6379
+      - DJANGO_SECRET_KEY=${DJANGO_SECRET_KEY}
+      - GOOGLE_ANALYTICS_ID=${GOOGLE_ANALYTICS_ID}
+      - SENTRY_BACKEND_DSN=${SENTRY_BACKEND_DSN}
+    volumes:
+      - ./data/db:/app/data
     depends_on:
       - db
       - redis
@@ -24,8 +28,10 @@ services:
     restart: unless-stopped
     environment:
       - POSTGRES_DB=app
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=mysuperpassword
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+    volumes:
+      - ./data/pgdata:/var/lib/postgresql/data
 
   redis:
     container_name: wildrace-redis