From ea51945f9248c67b702eb26551b5d58a4cf797d5 Mon Sep 17 00:00:00 2001 From: Henrik Saura Engen Date: Sun, 27 Aug 2023 13:09:40 +0000 Subject: [PATCH 1/4] Minor changes to docker-compose.yml and nginx.conf * Added STRIPE_PK: " " to docker-compose.yml * Added the infoscreen app as a server in nginx.conf --- phoenix-development/docker-compose.yml | 34 ++++++++++++++------------ phoenix-development/nginx.conf | 27 +++++++++++++++++++- 2 files changed, 44 insertions(+), 17 deletions(-) diff --git a/phoenix-development/docker-compose.yml b/phoenix-development/docker-compose.yml index 4d31ecc..9721da4 100644 --- a/phoenix-development/docker-compose.yml +++ b/phoenix-development/docker-compose.yml @@ -26,6 +26,7 @@ services: HOST: "http://delta.dev.phoenixlan.no:3000" REACT_APP_OAUTH_CLIENT_ID: "phoenix-delta-dev" REACT_APP_MAIN_SITE: "http://dev.phoenixlan.no:3000" + STRIPE_PK: " " env_file: .participate_env entrypoint: - bash @@ -113,25 +114,26 @@ services: logging: options: max-size: "1g" + info_page: + build: + context: ../../ + dockerfile: fullstack/phoenix-development/nodejs.Dockerfile + environment: + BASE_URL: "http://api.dev.phoenixlan.no:3000" + REACT_APP_API_URL: "http://api.dev.phoenixlan.no:3000" + entrypoint: + - bash + - "-c" + - "cd ../phoenixjs && yarn link && cd ../phoenix && yarn link @phoenixlan/phoenix.js && yarn && yarn start" + volumes: + - ../../phoenixinfo-v1:/srv/phoenix + - ../../phoenixjs:/srv/phoenixjs + logging: + options: + max-size: "1g" db: image: postgres:alpine env_file: .db_env - healthcheck: - test: ["CMD-SHELL", "pg_isready --username=phoenix"] - interval: 10s - timeout: 5s - retries: 5 - logging: - options: - max-size: "1g" - rabbitmq: - image: rabbitmq:alpine - env_file: .rabbitmq_env - healthcheck: - test: rabbitmq-diagnostics -q ping - interval: 5s - timeout: 30s - retries: 3 logging: options: max-size: "1g" diff --git a/phoenix-development/nginx.conf b/phoenix-development/nginx.conf index 8294603..2c0ad2b 100644 --- a/phoenix-development/nginx.conf +++ b/phoenix-development/nginx.conf @@ -50,6 +50,31 @@ http { + server { + listen 3000; + root /var/www; + server_name info.dev.phoenixlan.no; + index index.html index.htm; + + # Fuck Google + add_header Permissions-Policy interest-cohort=(); + + location / { + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_pass http://info_page:3000; + } + + location /ws { + proxy_pass http://info_page:3000; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $remote_addr; + } + } + server { listen 3000; root /var/www; @@ -105,4 +130,4 @@ http { } -} \ No newline at end of file +} From d3775aa39b3466afbced2fb3f62b3706a1d1754a Mon Sep 17 00:00:00 2001 From: Henrik Saura Engen Date: Fri, 8 Sep 2023 20:29:22 +0000 Subject: [PATCH 2/4] Minor changes to docker-compose.yml * Undid removal of rabbitmq, dont know why this happened. --- phoenix-development/docker-compose.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/phoenix-development/docker-compose.yml b/phoenix-development/docker-compose.yml index 9721da4..d3737fa 100644 --- a/phoenix-development/docker-compose.yml +++ b/phoenix-development/docker-compose.yml @@ -134,6 +134,22 @@ services: db: image: postgres:alpine env_file: .db_env + healthcheck: + test: ["CMD-SHELL", "pg_isready --username=phoenix"] + interval: 10s + timeout: 5s + retries: 5 + logging: + options: + max-size: "1g" + rabbitmq: + image: rabbitmq:alpine + env_file: .rabbitmq_env + healthcheck: + test: rabbitmq-diagnostics -q ping + interval: 5s + timeout: 30s + retries: 3 logging: options: max-size: "1g" From 155f90e2efbe8ca2a965003f88870337f9e882a0 Mon Sep 17 00:00:00 2001 From: Henrik Saura Engen Date: Mon, 11 Sep 2023 11:15:25 +0000 Subject: [PATCH 3/4] Added ports to db in docker-compose * Exposed port 5432 to the db container in docker-compose to allow connections and modifications through ex. pgAdmin. --- phoenix-development/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phoenix-development/docker-compose.yml b/phoenix-development/docker-compose.yml index d3737fa..0a820c2 100644 --- a/phoenix-development/docker-compose.yml +++ b/phoenix-development/docker-compose.yml @@ -134,6 +134,8 @@ services: db: image: postgres:alpine env_file: .db_env + ports: + - 5432:5432 healthcheck: test: ["CMD-SHELL", "pg_isready --username=phoenix"] interval: 10s From 33a1200825ab9858c69e62e5ae938f08b448a5e0 Mon Sep 17 00:00:00 2001 From: Henrik Saura Engen Date: Tue, 12 Sep 2023 07:22:53 +0000 Subject: [PATCH 4/4] Minor changes to docker-compose.yml * Removed STRIPE_PK from participate_page as requested in #4. * Removed exposing ports from db as requested in #4. --- phoenix-development/docker-compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/phoenix-development/docker-compose.yml b/phoenix-development/docker-compose.yml index 0a820c2..332ec3f 100644 --- a/phoenix-development/docker-compose.yml +++ b/phoenix-development/docker-compose.yml @@ -26,7 +26,6 @@ services: HOST: "http://delta.dev.phoenixlan.no:3000" REACT_APP_OAUTH_CLIENT_ID: "phoenix-delta-dev" REACT_APP_MAIN_SITE: "http://dev.phoenixlan.no:3000" - STRIPE_PK: " " env_file: .participate_env entrypoint: - bash @@ -134,8 +133,6 @@ services: db: image: postgres:alpine env_file: .db_env - ports: - - 5432:5432 healthcheck: test: ["CMD-SHELL", "pg_isready --username=phoenix"] interval: 10s