Merge pull request #59 from codeguru42/50-deploy

50 deploy

Author: codeguru42

.gitignore

@@ -1,5 +1,5 @@
 .idea
-.env
+*.env
 
 *.png
 *.jpg

Dockerfile

@@ -1,7 +1,6 @@
 FROM python:3.11-slim-buster
 
-RUN apt update
-RUN apt install libgl1 libglib2.0-0 -y
+RUN apt update && apt install libgl1 libglib2.0-0 -y
 
 RUN useradd -ms /bin/bash api
 USER api
@@ -12,5 +11,3 @@ ENV PATH=/home/api/.local/bin:${PATH}
 COPY pyproject.toml poetry.lock ./
 RUN poetry install
 COPY . ./
-
-CMD poetry run gunicorn go_capture.wsgi:application --bind 0.0.0.0:8000 -t 60

deploy.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
-export image_hash=$1
-export account_id=$(aws sts get-caller-identity --query Account --output text)
-aws ecr get-login-password | docker login --username AWS --password-stdin ${account_id}.dkr.ecr.us-west-1.amazonaws.com \
-  && docker compose down \
-  && docker compose up -d
+export IMAGE=$1
+export TAG=$2
+echo echo "Take down old api version..." \
+  && docker compose -f docker-compose-prod.yml down \
+  && echo "Bring up new api version..." \
+  && docker compose -f docker-compose-prod.yml -p go-capture-api up -d

docker-compose-dev.yml

@@ -3,11 +3,15 @@ services:
     build: .
     command: "poetry run python3 /api/manage.py runserver 0.0.0.0:8000"
     env_file:
-      - .env
+      - env/dev.env
     environment:
       - CELERY_BROKER_URL=amqp://guest:guest@broker:5672
+      - FIREBASE_CREDENTIALS_FILE=/run/secrets/firebase-credentials
+      - MEDIA_ROOT=/api/media
     ports:
       - 8000:8000
+    secrets:
+      - firebase-credentials
     volumes:
       - .:/api
   worker:
@@ -18,12 +22,20 @@ services:
     environment:
       - CELERY_BROKER_URL=amqp://guest:guest@broker:5672
       - CELERY_RESULT_BACKEND=rpc
+      - FIREBASE_CREDENTIALS_FILE=/run/secrets/firebase-credentials
+      - MEDIA_ROOT=/api/media
     env_file:
-      - .env
+      - env/dev.env
+    secrets:
+      - firebase-credentials
     volumes:
       - .:/api
   broker:
     image: rabbitmq:3-management
     ports:
       - 5672:5672
       - 15672:15672
+
+secrets:
+  firebase-credentials:
+    file: $FIREBASE_CREDENTIALS_FILE

docker-compose-prod.yml

@@ -1,24 +1,49 @@
 services:
   api:
-    image: ${image}:${tag}
-    env_file:
-      - .env
+    command: "poetry run gunicorn go_capture.wsgi:application --bind 0.0.0.0:8000 -t 60"
     environment:
       - CELERY_BROKER_URL=amqp://guest:guest@broker:5672
+      - FIREBASE_CREDENTIALS_FILE=/run/secrets/firebase-credentials
+      - MEDIA_ROOT=/api/media
+    env_file:
+      - env/prod.env
+    image: ${IMAGE}:${TAG}
     ports:
       - 8000:8000
+    secrets:
+      - firebase-credentials
+    volumes:
+      - media:/api/media
   worker:
-    image: ${image}:${tag}
     command: "poetry run celery -A go_capture.tasks worker"
     depends_on:
       - broker
     environment:
       - CELERY_BROKER_URL=amqp://guest:guest@broker:5672
       - CELERY_RESULT_BACKEND=rpc
+      - FIREBASE_CREDENTIALS_FILE=/run/secrets/firebase-credentials
+      - MEDIA_ROOT=/api/media
     env_file:
-      - .env
+      - env/prod.env
+    image: ${IMAGE}:${TAG}
+    secrets:
+      - firebase-credentials
+    volumes:
+      - media:/api/media
   broker:
     image: rabbitmq:3-management
     ports:
       - 5672:5672
       - 15672:15672
+
+volumes:
+  media:
+    driver: local
+    driver_opts:
+      type: none
+      o: bind
+      device: $MEDIA_ROOT
+
+secrets:
+  firebase-credentials:
+    file: $FIREBASE_CREDENTIALS_FILE

go_capture/settings.py

@@ -125,7 +125,7 @@
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
 MEDIA_URL = "media/"
-MEDIA_ROOT = BASE_DIR / "media"
+MEDIA_ROOT = env.path("MEDIA_ROOT")
 MEDIA_ROOT.mkdir(exist_ok=True)
 
 IMAGES_DIR = MEDIA_ROOT / "images"