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 +}