Add web-haproxy and web-nginx to docker-compose.production.yml

docker-compose.override.yml

@@ -4,6 +4,9 @@
 
 version: "3.1"
 services:
+  web:
+    ports:
+      - 8080:80
   covers:
     ports:
       - 7075:7075

docker-compose.production.yml

@@ -7,6 +7,62 @@
 
 version: "3.1"
 services:
+  web_haproxy:
+    image: haproxy:2.3.5
+    restart: always
+    #depends_on:
+    #  - www_haproxy
+    volumes:
+      #- olsystem ... /etc/haproxy/haproxy.cfg
+      #- ./docker/nginx.conf:/etc/nginx/nginx.conf:ro
+      #- ./docker/covers_nginx.conf:/etc/nginx/sites-enabled/covers_nginx.conf:ro
+      # Needed for HTTPS, since this is a public server
+      - ../olsystem/etc/haproxy/haproxy.cfg:/etc/haproxy/haproxy.cfg:ro
+      # Needs access to openlibrary for static files
+      #- ../olsystem:/olsystem
+      #- /1/var/lib/openlibrary/sitemaps/sitemaps:/sitemaps
+    ports:
+      - 80:80
+      - 443:443
+    networks:
+      - webnet
+    logging:
+      options:
+        max-size: "512m"
+        max-file: "4"
+    secrets:
+      - petabox_seed
+      # Needed by default-docker.conf
+      - ssl_certificate
+      - ssl_certificate_key
+  web_nginx:
+    image: nginx:1.19.4
+    restart: always
+    depends_on:
+      - www_haproxy
+    volumes:
+      - ./docker/nginx.conf:/etc/nginx/nginx.conf:ro
+      - ./docker/covers_nginx.conf:/etc/nginx/sites-enabled/covers_nginx.conf:ro
+      # Needed for HTTPS, since this is a public server
+      - ../olsystem/etc/nginx/sites-available/default-docker.conf:/etc/nginx/sites-enabled/default:ro
+      # Needs access to openlibrary for static files
+      - ../olsystem:/olsystem
+      - /1/var/lib/openlibrary/sitemaps/sitemaps:/sitemaps
+    ports:
+      - 80:80
+      - 443:443
+    networks:
+      - webnet
+    logging:
+      options:
+        max-size: "512m"
+        max-file: "4"
+    secrets:
+      - petabox_seed
+      # Needed by default-docker.conf
+      - ssl_certificate
+      - ssl_certificate_key
+
   web:
     restart: always
     hostname: "$HOSTNAME"

docker-compose.staging.yml

@@ -10,6 +10,8 @@ services:
   web:
     restart: always
     hostname: "$HOSTNAME"
+    ports:
+      - 8080:80
     environment:
       - GUNICORN_OPTS= --workers 4 --timeout 180
       - OL_CONFIG=/olsystem/etc/openlibrary.yml

docker-compose.yml

@@ -11,8 +11,9 @@ services:
       dockerfile: docker/Dockerfile.oldev
     command: docker/ol-web-start.sh
     ports:
-      - 8080:80
       - 3000:3000
+    expose:
+      - 80
     depends_on:
       - db
       - infobase