Merge pull request #775 from OpenHistoricalMap/staging

Production release - iD update

Author: Rub21

compose/web.yml

@@ -1,5 +1,6 @@
 services:
   db:
+    container_name: db
     platform: linux/amd64
     image: ohm-db:v2
     build:
@@ -14,31 +15,49 @@ services:
       - web_network
 
   web:
+    container_name: web
     image: ohm-web:v1
     build:
       context: ./../images/web
       dockerfile: Dockerfile
     volumes:
-      - ./../../ohm-website/:/var/www/
-      - ./../images/web/config/settings.yml:/tmp/settings.yml:rw
       - ./../images/web/start.sh:/var/www/start.sh
     env_file:
       - ./../envs/.env.web
     ports:
-      - '3000:3000'
+      - '3000:80'
     networks:
       - web_network
     depends_on:
       - db
       - memcached
 
   memcached:
+    container_name: memcached
     image: memcached:latest
     ports:
       - '11211:11211'
     networks:
       - web_network
 
+  # cgimap:
+  #   container_name: cgimap
+  #   image: ohm-cgimap:v1
+  #   build:
+  #     context: ./../images/cgimap
+  #     dockerfile: Dockerfile
+  #   env_file:
+  #     - ./../envs/.env.web
+  #   environment:
+  #     MEMCACHE_SERVER: memcached:11211
+  #   # ports:
+  #   #   - '8000:8000'
+  #   networks:
+  #     - web_network
+  #   depends_on:
+  #     - db
+  #     - memcached
+
 networks:
   web_network:
     driver: bridge

images/web/Dockerfile

@@ -16,15 +16,15 @@ RUN apt-get update && \
     git curl gnupg build-essential \
     libarchive-dev zlib1g-dev libcurl4-openssl-dev \
     apache2 apache2-dev libapache2-mod-fcgid libapr1-dev libaprutil1-dev \
-    postgresql-client libpq-dev libxml2-dev libyaml-dev \
+    postgresql-client libpq-dev libxml2-dev libyaml-dev libgd-dev \
     pngcrush optipng advancecomp pngquant jhead jpegoptim gifsicle libjpeg-progs unzip\
     && curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \
     && apt-get install -y nodejs \
     && npm install -g yarn svgo \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Download OHM Website using gitsha, faster than cloning
-ENV OPENHISTORICALMAP_WEBSITE_GITSHA=8690db86e4e5b51c4d59c1e2ec273bb2f8471189
+ENV OPENHISTORICALMAP_WEBSITE_GITSHA=8fe2e830e089da8eb1af4ce611ea361307ee2ba7
 ENV OHM_WEBSITE_URL=https://github.com/OpenHistoricalMap/ohm-website/archive/${OPENHISTORICALMAP_WEBSITE_GITSHA}.zip
 RUN rm -rf $workdir/* && curl -fsSL $OHM_WEBSITE_URL -o /tmp/ohm-website.zip && \
     unzip /tmp/ohm-website.zip -d /tmp && \

values.production.template.yaml

@@ -44,7 +44,7 @@ osm-seed:
       accessMode: ReadWriteOnce
       mountPath: /var/lib/postgresql/data
       subPath: postgresql-db
-      AWS_ElasticBlockStore_volumeID : vol-0595bcb6ac2ba84a3
+      AWS_ElasticBlockStore_volumeID: vol-0595bcb6ac2ba84a3
       AWS_ElasticBlockStore_size: 600Gi
     resources:
       enabled: true

values.staging.template.yaml

@@ -47,7 +47,7 @@ osm-seed:
         accessMode: ReadWriteOnce
         mountPath: /var/lib/postgresql/data
         subPath: postgresql-db
-        AWS_ElasticBlockStore_volumeID : vol-05ffbd749907e949f
+        AWS_ElasticBlockStore_volumeID: vol-025cab988ae190a7b
         AWS_ElasticBlockStore_size: 200Gi
       resources:
         enabled: false