diff --git a/docker-compose-development.rendertron.yml b/docker-compose-development.rendertron.yml index 422c741352cf10159cf72486bd25a773942405dd..fed87f502ad3a10821e14e0b6d9ed2b75b4c1d5c 100644 --- a/docker-compose-development.rendertron.yml +++ b/docker-compose-development.rendertron.yml @@ -1,29 +1,26 @@ -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 diff --git a/docker/dev/Dockerfile-rendertron b/docker/dev/Dockerfile-rendertron new file mode 100644 index 0000000000000000000000000000000000000000..a1ada574c9a499d777d42a5b83c5c9972ebca6b6 --- /dev/null +++ b/docker/dev/Dockerfile-rendertron @@ -0,0 +1 @@ +FROM scandipwa/rendertron diff --git a/docker/dev/nginx-development-proxy.conf b/docker/dev/nginx-development-proxy.conf index c18b00639f761c340bc2a7f03f395f5e6dd6639d..eb8700ce106fea57463425c3bf289467f6283b85 100644 --- a/docker/dev/nginx-development-proxy.conf +++ b/docker/dev/nginx-development-proxy.conf @@ -1,7 +1,7 @@ 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 {