Update osmcha-deployments

developmentseed · Dec 15, 2023 · 5fa51eb · 5fa51eb
1 parent 1c243bd
commit 5fa51eb
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 402 deletions.
diff --git a/compose/osmcha.yml b/compose/osmcha.yml
@@ -1,15 +1,11 @@
-version: '3'
+version: '3.8'
 services: 
   web:
     platform: linux/amd64
-    image: developmentseed/osmseed-osmcha-web:v6
+    image: developmentseed/osmseed-osmcha-web:v7
     build:
       context: ../images/osmcha-web
       dockerfile: Dockerfile
-    # command: >
-    #   /bin/bash -c "
-    #   ./start.sh
-    #   "
     env_file:
     - ../envs/.env.osmcha
     volumes:
@@ -28,25 +24,13 @@ services:
     - ../envs/.env.osmcha
   api:
     platform: linux/amd64
-    image: developmentseed/osmseed-osmcha-api:v3
-    build:
-      context: ../images/osmcha-api
-      dockerfile: Dockerfile
+    image: ghcr.io/willemarcel/osmcha-django:b1f4e6afc90e08707cadc4d74580632ca3b93dd2
+    # build:
+    #   context: ../images/osmcha-api
+    #   dockerfile: Dockerfile
     ports:
-    - '3000:3000'
+    - '5000:5000'
     env_file:
     - ../envs/.env.osmcha
     volumes:
     - ../data/osmcha/staticfiles:/staticfiles
-  nginx:
-    platform: linux/amd64
-    image: developmentseed/osmseed-osmcha-nginx:v1
-    build:
-      context: ../images/osmcha-nginx
-      dockerfile: Dockerfile
-    ports:
-    - '80:80'
-    env_file:
-    - ../envs/.env.osmcha
-    volumes:
-    - ../data/osmcha/staticfiles:/staticfiles
diff --git a/images/osmcha-api/Dockerfile b/images/osmcha-api/Dockerfile
diff --git a/images/osmcha-api/entrypoint.sh b/images/osmcha-api/entrypoint.sh
diff --git a/images/osmcha-nginx/Dockerfile b/images/osmcha-nginx/Dockerfile
diff --git a/images/osmcha-nginx/config/mime.types b/images/osmcha-nginx/config/mime.types
diff --git a/images/osmcha-nginx/config/nginx.conf b/images/osmcha-nginx/config/nginx.conf
diff --git a/images/osmcha-web/Dockerfile b/images/osmcha-web/Dockerfile
@@ -3,15 +3,17 @@ FROM node:16-slim as builder
 ENV DEBIAN_FRONTEND noninteractive
 
 ARG BUILD_ENV=prod
+ARG OSMCHA_URL=https://osmcha-staging.openhistoricalmap.org
 
 RUN apt-get update && apt-get install -y git
 
 RUN mkdir /app
 WORKDIR /app
 RUN git clone https://github.com/sunu/osmcha-frontend.git /app
 RUN yarn install
-
 ENV REACT_APP_PRODUCTION_API_URL /api/v1
+RUN sed -i "s|https://osmcha.org|$OSMCHA_URL|g" package.json
 RUN yarn build:${BUILD_ENV}
-COPY start.sh .
-CMD [ "./start.sh" ]
+
+FROM nginx:alpine
+COPY --from=builder /app/build /assets
diff --git a/images/osmcha-web/README.md b/images/osmcha-web/README.md
diff --git a/images/osmcha-web/config/mime.types b/images/osmcha-web/config/mime.types
diff --git a/images/osmcha-web/config/nginx.conf b/images/osmcha-web/config/nginx.conf