Osmcha web continaer

Author: Rub21

compose/osmcha.yml

@@ -1,60 +1,39 @@
-version: "3.8"
 services:
-  web:
-    platform: linux/amd64
-    image: developmentseed/osmseed-osmcha-web:v16
+  django:
+    image: "ghcr.io/openhistoricalmap/osmcha-django:upstream_main"
+    depends_on:
+      - redis
+    volumes:
+      # Copy static files into a shared volume so the frontend can serve them
+      - staticfiles:/app/staticfiles
+    env_file: ./../envs/.env.osmcha
+    ports:
+      - "5001:5000"
+    entrypoint: ["/bin/sh", "-c"]
+    command:
+      - |
+        python manage.py migrate --verbosity 3 && \
+        python manage.py collectstatic --noinput && \
+        gunicorn config.wsgi -t 120 -b 0.0.0.0:5000 --access-logfile - --log-level debug
+  frontend:
     build:
       context: ../images/osmcha-web
       dockerfile: Dockerfile
-    env_file:
-    - ../envs/.env.osmcha
+    depends_on:
+      - django
     volumes:
-    - ../data/osmcha/staticfiles:/staticfiles
-  db:
-    platform: linux/amd64
-    image: osmseed-osmcha-db:v1
-    build:
-      context: ../images/osmcha-db
-      dockerfile: Dockerfile
+      # frontend serves django app's static files via shared volume
+      - staticfiles:/srv/www/static/django
+    env_file: ./../envs/.env.osmcha
+
     ports:
-    - "5432:5432"
-    volumes:
-    - ../data/osmcha-db-data:/var/lib/postgresql/data
-    env_file:
-    - ../envs/.env.osmcha
-  init:
-    platform: linux/amd64
-    image: ghcr.io/willemarcel/osmcha-django:b1f4e6afc90e08707cadc4d74580632ca3b93dd2
-    command: >
-      /bin/bash -c "
-        set -x
-        python manage.py collectstatic
-        python manage.py migrate
-        mkdir -p /staticfiles/static
-        cp -r /app/staticfiles/* /staticfiles/static/
-      "
-    env_file:
-    - ../envs/.env.osmcha
-    volumes:
-    - ../data/osmcha/staticfiles:/staticfiles
-  api:
-    platform: linux/amd64
-    image: ghcr.io/willemarcel/osmcha-django:b1f4e6afc90e08707cadc4d74580632ca3b93dd2
-    build:
-      context: ../images/osmcha-api
-      dockerfile: Dockerfile
-    command: >
-      /bin/bash -c "
-        set -x
-        python manage.py collectstatic
-        python manage.py migrate
-        mkdir -p /staticfiles/static
-        cp -r /app/staticfiles/* /staticfiles/static/
-        gunicorn --workers 4 --bind 0.0.0.0:5000 --log-file - --access-logfile - config.wsgi
-      "
+      - "8000:80"
+
+  redis:
+    image: redis:latest
+    container_name: redis
+    restart: always
     ports:
-    - "5000:5000"
-    env_file:
-    - ../envs/.env.osmcha
-    volumes:
-    - ../data/osmcha/staticfiles:/staticfiles
+      - "6379:6379"
+volumes:
+  staticfiles:

images/osmcha-web/Dockerfile

@@ -1,15 +1,28 @@
-FROM node:16-slim as builder
+FROM node:22-alpine as builder
+
 ENV DEBIAN_FRONTEND noninteractive
-ENV BUILD_ENV=prod
-ENV REACT_APP_PRODUCTION_API_URL=/api/v1
-RUN apt-get update && apt-get install -y git \
-    && rm -rf /var/lib/apt/lists/*
-RUN mkdir /app
-WORKDIR /app
+
 ARG GITSHA=3cd987bd2ed02bbb60b121ecad0bb556a115aca1
-RUN git clone https://github.com/osmus/osmcha-frontend.git /app
-RUN git checkout $GITSHA
+ARG BUILD_ENV=prod
+
+WORKDIR /app
+
+## Clone osmcha repo
+RUN apk add --no-cache git \
+    && git clone https://github.com/OSMCha/osmcha-frontend.git /app \
+    && cd /app \
+    && git checkout $GITSHA
+
+RUN yarn set version stable
 RUN yarn install
-RUN yarn build:prod
-COPY start.sh .
-CMD [ "/app/start.sh" ]
+
+ENV REACT_APP_PRODUCTION_API_URL /api/v1
+ENV NODE_OPTIONS --openssl-legacy-provider
+
+RUN yarn run build:${BUILD_ENV}
+
+FROM nginx:alpine
+
+COPY --from=builder /app/build /srv/www
+
+COPY nginx.conf /etc/nginx/templates/default.conf.template

images/osmcha-web/nginx.conf

@@ -0,0 +1,36 @@
+server {
+  listen 80;
+  charset utf-8;
+
+  include /etc/nginx/mime.types;
+  default_type application/octet-stream;
+
+  gzip on;
+  sendfile on;
+  tcp_nopush on;
+  tcp_nodelay on;
+  keepalive_timeout 65;
+
+  location ~ ^/(api|admin) {
+    # /api and /admin routes are handled by the backend
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host $http_host;
+    proxy_redirect off;
+    proxy_pass $BACKEND_URL;
+  }
+
+  location /static {
+    # /static files are served without any magic (exact path or 404)
+    root /srv/www;
+    try_files $uri =404;
+  }
+
+  location / {
+    # other routes are served by trying the exact path, and falling back to
+    # serving the app entrypoint (index.html). this is needed because the
+    # frontend JS code uses the path component of the URL in its client-side
+    # routing.
+    root /srv/www;
+    try_files $uri $uri/ /index.html;
+  }
+}