better configuration

Author: squidgetx

Dockerfile

@@ -30,27 +30,19 @@ RUN ./install-packages.sh
 # ----------------------------------------------------
 # Install dependencies
 # ----------------------------------------------------
-FROM common-base AS dependencies
+FROM common-base AS app-run
+
 ENV PATH="/opt/venv/bin:$PATH"
 
-#     apt-get install build-essential -y
 COPY requirements.txt /app/
-
-RUN pip install --target /opt/packages -r requirements.txt
-
-# ----------------------------------------------------
-# Copy project
-# ----------------------------------------------------
-FROM common-base AS app-run
-COPY --from=dependencies /opt/packages /opt/packages
-ENV PYTHONPATH "${PYTHONPATH}:/opt/packages"
-# ENV  PYTHONPATH="$PYTHONPATH:/app/lemarche:/app/config"
 COPY ./ark ./ark
 COPY ./ark_import ./ark_import
 COPY ./arklet ./arklet
 COPY ./manage.py ./manage.py
 COPY ./docker/entrypoint.sh ./entrypoint.sh
 
+RUN pip install -r requirements.txt
+
 # ----------------------------------------------------
 # Run Dev
 # ----------------------------------------------------

docker-compose.nginx.yml

@@ -0,0 +1,55 @@
+version: "3.7"
+
+services:
+  arklet-minter:
+    container_name: arklet_minter
+    restart: always
+    build:
+      context: .
+      target: prod
+      dockerfile: ./Dockerfile
+    command: /app/entrypoint.sh
+    volumes:
+      - ./ark:/app/ark
+      - ./arklet:/app/arklet
+      - static_volume:/app/static
+    env_file:
+      - ./docker/env.prod
+    env:
+      - ARKLET_PORT: 8001
+    expose:
+      - 8001
+
+  arklet-resolver:
+    container_name: arklet_resolver
+    restart: always
+    build:
+      context: .
+      target: prod
+      dockerfile: ./Dockerfile
+    command: /app/entrypoint.sh
+    volumes:
+      - ./ark:/app/ark
+      - ./arklet:/app/arklet
+      - static_volume:/app/static
+    env_file:
+      - ./docker/env.prod
+    env:
+      - ARKLET_PORT: 8000
+      - RESOLVER: true
+    expose:
+      - 8000
+
+  nginx:
+    build: ./nginx
+    ports:
+      - 80:80
+      - 8080:8080
+    depends_on:
+      - arklet-minter
+      - arklet-resolver
+    volumes:
+      - static_volume:/app/static
+
+volumes:
+  static_volume:

docker-compose.prod.yml

@@ -8,10 +8,9 @@ services:
       context: .
       target: prod
       dockerfile: ./Dockerfile
-    command: /app/entrypoint.sh
+    command: /app/entrypoint.prod.sh
     volumes:
       - ./ark:/app/ark
-      - ./ark_import:/app/ark_import
       - ./arklet:/app/arklet
     env_file:
       - ./docker/env.postgres.prod
@@ -26,10 +25,9 @@ services:
       context: .
       target: prod
       dockerfile: ./Dockerfile
-    command: /app/entrypoint.sh
+    command: /app/entrypoint.prod.sh
     volumes:
       - ./ark:/app/ark
-      - ./ark_import:/app/ark_import
       - ./arklet:/app/arklet
     env_file:
       - ./docker/env.postgres.prod

docker/entrypoint.sh

@@ -9,12 +9,11 @@ while ! pg_isready -h $ARKLET_POSTGRES_HOST -p $ARKLET_POSTGRES_PORT; do
     sleep 1
 done
 
-# Following rules depend on what you expect from django dev docker
-# ./manage.py collectstatic --noinput
-# ./manage.py compress --force
-
 ./manage.py migrate
-./manage.py createsuperuser
 
-./manage.py runserver 0.0.0.0:$ARKLET_PORT
-# gunicorn config.wsgi:application -w 2 -b :8880 --reload
+if [ "$ENV" = "dev" ]; then
+    ./manage.py runserver 0.0.0.0:$ARKLET_PORT
+else
+    ./manage.py collectstatic --noinput
+    gunicorn arklet.wsgi:application --bind 0.0.0.0:$ARKLET_PORT 
+fi

docker/env.local

@@ -0,0 +1,19 @@
+ARKLET_DJANGO_SECRET_KEY=local-test-secret ##ggignore
+ARKLET_DEBUG=True
+ARKLET_HOST=127.0.0.1
+
+# Would be nice to undup these eventually
+POSTGRES_DB=arklet
+ARKLET_POSTGRES_NAME=arklet
+
+POSTGRES_USER=postgres
+ARKLET_POSTGRES_USER=postgres
+
+POSTGRES_PASSWORD=postgres # ggignore
+ARKLET_POSTGRES_PASSWORD=postgres # ggignore
+
+POSTGRES_HOST=postgres 
+ARKLET_POSTGRES_HOST=postgres 
+
+POSTGRESQL_PORT=5432
+ARKLET_POSTGRES_PORT=5432

docker/env.minter.local

@@ -0,0 +1,20 @@
+ARKLET_DJANGO_SECRET_KEY=
+
+ARKLET_DEBUG=False
+ARKLET_HOST=ark.frick.org
+
+# Would be nice to undup these eventually
+POSTGRES_DB=arklet
+ARKLET_POSTGRES_NAME=arklet
+
+POSTGRES_USER=arklet_user
+ARKLET_POSTGRES_USER=arklet_user
+
+POSTGRES_PASSWORD=
+ARKLET_POSTGRES_PASSWORD=
+
+POSTGRES_HOST=
+ARKLET_POSTGRES_HOST=
+
+POSTGRESQL_PORT=25060
+ARKLET_POSTGRES_PORT=25060

docker/env.minter.prod

@@ -1,10 +1,13 @@
-default: prod
+default: local
 
-prod: 
-	docker-compose -f docker-compose.prod.yml up 
+local:
+	docker-compose up --build
+
+nginx: 
+	docker-compose -f docker-compose.nginx.yml up --build
 
 dev-cmd:
 	docker exec -it arklet_minter /bin/bash
 
 dev-psql:
-	source docker/env.postgres.local && docker exec -it arklet_db psql -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
+	source docker/env.local && docker exec -it arklet_db psql -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"

docker/env.postgres.local

@@ -0,0 +1,4 @@
+FROM nginx:1.25
+
+RUN rm /etc/nginx/conf.d/default.conf
+COPY nginx.conf /etc/nginx/conf.d

docker/env.postgres.prod

@@ -0,0 +1,39 @@
+upstream arklet_resolver {
+    # matches the container name and port in docker-compose.nginx.yml
+    server arklet_resolver:8000;
+}
+
+upstream arklet_minter {
+    # matches the container name and port in docker-compose.nginx.yml
+    server arklet_minter:8001;
+}
+
+
+server {
+
+    listen 80;
+
+    location / {
+        proxy_pass http://arklet_resolver;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header Host $host;
+        proxy_redirect off;
+    }
+
+}
+
+server {
+    listen 8080;
+
+    location / {
+        proxy_pass http://arklet_minter;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header Host $host;
+        proxy_redirect off;
+    }
+
+    location /static/ {
+        alias /app/static/;
+    }
+
+}