--amend

e80d04d1 · Matthieu Benoist · 8d7f79ab · e80d04d1 · e80d04d1 · e80d04d1
Commit e80d04d1 authored 4 years ago by Matthieu Benoist
--- a/docker-compose-development.rendertron.yml
+++ b/docker-compose-development.rendertron.yml
-version: "3"
+version: "3.7"

 services:
  rendertron:
-    context: ./docker/dev/
-    dockerfile: Dockerfile-rendertron
+    build:
+      context: ./docker/dev/
+      dockerfile: Dockerfile-rendertron

  proxy:
-    context: ./docker/dev/
-    dockerfile: Dockerfile-nginx
+    build:
+      context: ./docker/dev/
+      dockerfile: Dockerfile-nginx
    volumes:
      - ./docker/dev/nginx-development-proxy.conf:/etc/nginx/conf.d/default.conf
-      - /app/dist/fr:/usr/share/nginx/html/
-      - /app/dist/en:/usr/share/nginx/html/en/
+    labels:
+      - "traefik.fronted.rule=Host:data.grandlyon.docker"
+      - "traefik.port=80"
+      - "traefik.docker.network=grandlyon"
+    networks:
+      - default
+      - grandlyon

-  web-app:
-    restart: unless-stopped
-    build: .
-    image: registry.forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/custom-apps/web-app:${TAG}
-    volumes:
-      - ./nginx.conf.template:/etc/nginx/nginx.conf.template
-    ports:
-      - ${WEB_APP_BIND_PORT}:8080
-    command: >
-      /bin/sh -c
-      'sed "s#<MATOMO_SITE_ID>#$MATOMO_SITE_ID#g; s#<MATOMO_SERVER_URL>#$MATOMO_SERVER_URL#g" /etc/nginx/nginx.conf.template
-      > /etc/nginx/conf.d/default.conf
-      && nginx -g "daemon off;"'
+networks:
+  grandlyon:
+    external: true

--- a/docker/dev/Dockerfile-rendertron
+++ b/docker/dev/Dockerfile-rendertron
+FROM scandipwa/rendertron
--- a/docker/dev/nginx-development-proxy.conf
+++ b/docker/dev/nginx-development-proxy.conf
 server {
    # staging server is listening on the port 8180
-    listen 8180;
-    server_name _;
+    listen 80;
+    server_name data.grandlyon.docker;
    root /usr/share/nginx/html/;

    set $en 0;
@@ -43,15 +43,18 @@ server {
        rewrite .* /render/$scheme://$server_name$request_uri break;
        proxy_pass http://rendertron:8083;
      }
-      if ($prerender = 0) {
-        if ($en = 0) {
-          rewrite .* /index.html break;
-          sub_filter '<html lang="en">' '<html lang="fr">';
-        }
-        else {
-          rewrite .*/en/index.html break;
-        }
+
+      if ($en = 0) {
+        rewrite .* /index.html break;
+        #sub_filter '<html lang="en">' '<html lang="fr">';
+        proxy_pass http://host.docker.internal:4200;
+        add_header Access-Control-Allow-Origin *;
+      }
+      if ($en = 1) {
+        rewrite .*/en/index.html break;
+        proxy_pass http://host.docker.internal:4200;
      }
+
    }

    #location /robots.txt {