prod dockerfile

.github/workflows/docker-image.yml

@@ -24,6 +24,6 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v5
         with:
-          file: docker/Dockerfile
+          file: Dockerfile-prod
           push: true
           tags: zediious/raptor-web:latest

docker/Dockerfile → Dockerfile

@@ -1,4 +1,8 @@
-# Dockerfile for raptorapp
+# Dockerfile for raptor-web development
+# This image does NOT build the app's code into the image.
+# It instead relies on paths to local files in docker-compose.yml
+# Use docker-compose-prod.yml for production.
+
 FROM continuumio/miniconda3:latest
 
 # Install host dependencies
@@ -7,7 +11,7 @@ RUN apt install libmariadb-dev -y
 RUN apt install gcc -y
 
 # Copy Conda environment and install environment
-COPY ../environment.yml environment.yml
+COPY environment.yml environment.yml
 RUN conda env create
 
 # Add initialization script and define entrypoint

Dockerfile-prod

@@ -0,0 +1,15 @@
+# Dockerfile for raptorapp
+FROM continuumio/miniconda3:latest
+
+# Install host dependencies
+RUN apt update
+RUN apt install libmariadb-dev -y
+RUN apt install gcc -y
+
+# Copy project files and install environment
+COPY . /raptorWebApp
+RUN conda env create -f /raptorWebApp/environment.yml
+
+# Define entrypoint
+RUN chmod +x+r -R /raptorWebApp/docker/init
+ENTRYPOINT ["/raptorWebApp/docker/init/run-raptorapp.sh"]

docker-compose-prod.yml

@@ -0,0 +1,40 @@
+version: '3'
+services:
+
+  mariadb:
+    image: mariadb:latest
+    container_name: mariadb
+    expose:
+      - 3306
+    env_file:
+    - stack.env
+    volumes:
+      - raptor-db:/var/lib/mysql/
+
+  raptorapp:
+    image: zediious/raptor-web:latest
+    container_name: raptorapp
+    expose:
+      - 80
+    volumes:
+      - raptor-media:/raptorWebApp/media/
+      - raptor-conf:/raptorWebApp//docker/nginx/conf.d/
+      - ./stack.env:/raptorWebApp/stack.env
+    depends_on:
+      - mariadb
+
+  nginx:
+    image: nginx:latest
+    container_name: nginx
+    ports:
+      - 443:443
+    volumes:
+      - raptor-media:/raptorWeb/media:/raptor_app/media/
+      - raptor-conf:/etc/nginx/conf.d/
+    depends_on:
+      - raptorapp
+
+volumes:
+  raptor-db:
+  raptor-media:
+  raptor-conf:

docker-compose.yml

@@ -1,3 +1,7 @@
+# Compose file for raptor-web development
+# This re-builds the application image on load.
+# Use docker-compose-prod.yml for production.
+
 version: '3'
 services:
 
@@ -14,7 +18,7 @@ services:
   raptorapp:
     build:
       context: .
-      dockerfile: docker/Dockerfile
+      dockerfile: Dockerfile
     container_name: raptorapp
     expose:
       - 80