11 make loadbalancer build free (#12)

Altinn · Feb 13, 2023 · da8fe47 · da8fe47
1 parent 3ff21ec
commit da8fe47
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,7 +7,7 @@ networks:
 services:
   localtest_loadbalancer:
     container_name: localtest-loadbalancer
-    image: localtest-loadbalancer:latest
+    image: nginx:alpine-perl
     restart: always
     networks:
       - altinntestlocal_network
@@ -18,11 +18,15 @@ services:
       - NGINX_PORT=80
       - TEST_DOMAIN=${TEST_DOMAIN:-local.altinn.cloud}
       - ALTINN3LOCAL_PORT=${ALTINN3LOCAL_PORT:-80}
-      - NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx
-    build:
-      context: ./loadbalancer
+      - NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx/
+      - NGINX_ENVSUBST_TEMPLATE_SUFFIX=.conf
     extra_hosts:
       - "host.docker.internal:host-gateway"
+    volumes:
+      - ./loadbalancer/templates:/etc/nginx/templates/:ro
+      - ./loadbalancer/www:/www/:ro
+
+
   altinn_platform_pdf:
     container_name: altinn-pdf
     platform: linux/amd64
@@ -46,6 +50,7 @@ services:
       - "5300:3000"
     extra_hosts:
       - "${TEST_DOMAIN:-local.altinn.cloud}:host-gateway"
+
   altinn_localtest:
     container_name: localtest
     image: localtest:latest
@@ -66,5 +71,6 @@ services:
       - ${ALTINN3LOCALSTORAGE_PATH:-AltinnPlatformLocal}:/AltinnPlatformLocal
     extra_hosts:
       - "host.docker.internal:host-gateway"
+
 volumes:
   AltinnPlatformLocal:
diff --git a/loadbalancer/Dockerfile b/loadbalancer/Dockerfile
diff --git a/loadbalancer/nginx.conf → loadbalancer/templates/nginx.conf.conf b/loadbalancer/nginx.conf → loadbalancer/templates/nginx.conf.conf
diff --git a/loadbalancer/502Accessmanagement.html → loadbalancer/www/502Accessmanagement.html b/loadbalancer/502Accessmanagement.html → loadbalancer/www/502Accessmanagement.html
diff --git a/loadbalancer/502App.html → loadbalancer/www/502App.html b/loadbalancer/502App.html → loadbalancer/www/502App.html
diff --git a/loadbalancer/502LocalTest.html → loadbalancer/www/502LocalTest.html b/loadbalancer/502LocalTest.html → loadbalancer/www/502LocalTest.html
diff --git a/loadbalancer/502Receipt.html → loadbalancer/www/502Receipt.html b/loadbalancer/502Receipt.html → loadbalancer/www/502Receipt.html