Merge pull request #4 from phoenixlan/update/addInfoscreen

Add infoscreen to the fullstack, fix stripe_pk to docker-compose

phoenix-development/docker-compose.yml

@@ -113,6 +113,23 @@ 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

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