Merge pull request #24 from reload/storybook-tweaks-2.0

blyme · web-flow · commit f49f9196154e · 2024-10-04T17:10:11.000+02:00
Storybook tweaks 2.0
diff --git a/Dockerfile b/Dockerfile
@@ -51,4 +51,3 @@ FROM proxy AS storybook
 COPY /storybook /
 
 ENV NGINX_PROXY_PASS=http://app:6006
-ENV SERVER_CHANNEL_PROXY_PASS=ws://app:6006/storybook-server-channel
diff --git a/context/storybook/etc/nginx/templates/default.conf.template b/context/storybook/etc/nginx/templates/default.conf.template
@@ -6,7 +6,6 @@ server {
 
     location / {
         proxy_pass ${NGINX_PROXY_PASS};
-        proxy_pass_reverse ${NGINX_PROXY_PASS};
     }
 
     location /__webpack-hmr {
@@ -18,6 +17,10 @@ server {
     }
 
     location /storybook-server-channel {
-        proxy_pass ${SERVER_CHANNEL_PROXY_PASS};
+        proxy_pass ${NGINX_PROXY_PASS};
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header Host $host;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -51,4 +51,3 @@ FROM proxy AS storybook`
`51`	`51`	`COPY /storybook /`
`52`	`52`
`53`	`53`	`ENV NGINX_PROXY_PASS=http://app:6006`
`54`		`-ENV SERVER_CHANNEL_PROXY_PASS=ws://app:6006/storybook-server-channel`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ server {`
`6`	`6`
`7`	`7`	`location / {`
`8`	`8`	`proxy_pass ${NGINX_PROXY_PASS};`
`9`		`- proxy_pass_reverse ${NGINX_PROXY_PASS};`
`10`	`9`	`}`
`11`	`10`
`12`	`11`	`location /__webpack-hmr {`
`@@ -18,6 +17,10 @@ server {`
`18`	`17`	`}`
`19`	`18`
`20`	`19`	`location /storybook-server-channel {`
`21`		`- proxy_pass ${SERVER_CHANNEL_PROXY_PASS};`
	`20`	`+ proxy_pass ${NGINX_PROXY_PASS};`
	`21`	`+ proxy_http_version 1.1;`
	`22`	`+ proxy_set_header Upgrade $http_upgrade;`
	`23`	`+ proxy_set_header Connection "Upgrade";`
	`24`	`+ proxy_set_header Host $host;`
`22`	`25`	`}`
`23`	`26`	`}`