[mod] switched nginx to stable-alpine and updated certbot to 1.16.0

[mod] added regex to strip port from upstream name in html files
[fix] fixed page title of error pages to be var based in web container
2021-07-02 16:02:59 -04:00 · 2021-02-28 12:08:58 -05:00 · 2021-02-28 01:31:06 -05:00 · 2021-02-28 00:32:54 -05:00 · 2021-02-27 23:54:16 -05:00
14 changed files with 89 additions and 44 deletions
--- a/certbot/Dockerfile
+++ b/certbot/Dockerfile
@@ -1,4 +1,4 @@
-FROM certbot/certbot:v1.12.0 
+FROM certbot/certbot:v1.16.0 

 ARG USER_UUID=12000
 ARG USER_GUID=12000
@@ -31,4 +31,4 @@ RUN chmod +x /entrypoint.sh

 USER $USER_NAME

-ENTRYPOINT [ "/entrypoint.sh" ]
+ENTRYPOINT [ "/entrypoint.sh" ]
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,8 +17,8 @@ services:
    image: proxy
    container_name: proxy
    ports:
-      - "9980:8080"
-      - "9443:8443"
+      - "80:8080"
+      - "443:8443"
    networks:
      - service_web
      - service_certbot
--- a/proxy/Dockerfile
+++ b/proxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.18-alpine
+FROM nginx:stable-alpine

 ARG USER_UUID=12000
 ARG USER_GUID=12000
--- a/proxy/files/html/errors/error.html
+++ b/proxy/files/html/errors/error.html
@@ -7,15 +7,19 @@
    <link href="/0x90/css/blink.css" rel="stylesheet">
    <link href="/0x90/css/main.css" rel="stylesheet">
    <meta charset="utf-8">
-    <title>pdev Studio</title>
+    <title><!--# echo var="server_domain" default="some" --></title>
  </head>
  <body>
    <div class="pure-g">
      <div class="pure-u-1-1"> 
        <div class="logo">
-          <div class="left"><!--# echo var="server_domain" default="pdev" --></div>
+          <div class="left"><!--# echo var="server_domain" default="some" --></div>
          <div class="hash">#</div>
-          <div class="right"><!--# echo var="upstream" default="Studio" --></div>
+          <div class="right">
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
        </div>  
      </div>
      <div class="pure-u-1-1"></div>
--- a/proxy/files/html/errors/error_403.html
+++ b/proxy/files/html/errors/error_403.html
@@ -7,15 +7,19 @@
    <link href="/0x90/css/blink.css" rel="stylesheet">
    <link href="/0x90/css/main.css" rel="stylesheet">
    <meta charset="utf-8">
-    <title>pdev Studio</title>
+    <title><!--# echo var="server_domain" default="some" --></title>
  </head>
  <body>
    <div class="pure-g">
      <div class="pure-u-1-1"> 
        <div class="logo">
-          <div class="left"><!--# echo var="server_domain" default="pdev" --></div>
+          <div class="left"><!--# echo var="server_domain" default="some" --></div>
          <div class="hash">#</div>
-          <div class="right"><!--# echo var="upstream" default="Studio" --></div>
+          <div class="right">
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
        </div>  
      </div>
      <div class="pure-u-1-1"></div>
--- a/proxy/files/html/errors/error_404.html
+++ b/proxy/files/html/errors/error_404.html
@@ -7,15 +7,19 @@
    <link href="/0x90/css/blink.css" rel="stylesheet">
    <link href="/0x90/css/main.css" rel="stylesheet">
    <meta charset="utf-8">
-    <title>pdev Studio</title>
+    <title><!--# echo var="server_domain" default="some" --></title>
  </head>
  <body>
    <div class="pure-g">
      <div class="pure-u-1-1"> 
        <div class="logo">
-          <div class="left"><!--# echo var="server_domain" default="pdev" --></div>
+          <div class="left"><!--# echo var="server_domain" default="some" --></div>
          <div class="hash">#</div>
-          <div class="right"><!--# echo var="upstream" default="Studio" --></div>
+          <div class="right">
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
        </div>  
      </div>
      <div class="pure-u-1-1"></div>
--- a/proxy/files/html/errors/error_50x.html
+++ b/proxy/files/html/errors/error_50x.html
@@ -7,7 +7,7 @@
    <link href="/0x90/css/blink.css" rel="stylesheet">
    <link href="/0x90/css/main.css" rel="stylesheet">
    <meta charset="utf-8">
-    <title>pdev Studio</title>
+    <title><!--# echo var="server_domain" default="some" --></title>
  </head>
  <body>

@@ -15,9 +15,13 @@
    <div class="pure-g">
      <div class="pure-u-1-1"> 
        <div class="logo">
-          <div class="left"><!--# echo var="server_domain" default="pdev" --></div>
+          <div class="left"><!--# echo var="server_domain" default="some" --></div>
          <div class="hash">#</div>
-          <div class="right"><!--# echo var="upstream" default="Studio" --></div>
+          <div class="right">
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
        </div>  
      </div>
      <div class="pure-u-1-1"></div>
--- a/proxy/files/nginx.conf
+++ b/proxy/files/nginx.conf
@@ -33,6 +33,12 @@ http {
        "~(?<domain_name>[a-zA-Z0-9-]*)(\.[a-z]*)$" "$domain_name";
    }
    
+    # websocket upgrade mapping
+    map $http_upgrade $connection_upgrade {
+        default upgrade;
+        '' close;
+    }
+    
    server {
        listen 8080 default_server;

--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.18-alpine
+FROM nginx:stable-alpine

 ARG USER_UUID=12000
 ARG USER_GUID=12000
--- a/web/files/html/errors/error.html
+++ b/web/files/html/errors/error.html
@@ -7,15 +7,19 @@
    <link href="/0x90/css/blink.css" rel="stylesheet">
    <link href="/0x90/css/main.css" rel="stylesheet">
    <meta charset="utf-8">
-    <title>pdev Studio</title>
+    <title><!--# echo var="server_domain" default="some" --></title>
  </head>
  <body>
    <div class="pure-g">
      <div class="pure-u-1-1"> 
        <div class="logo">
-          <div class="left"><!--# echo var="server_domain" default="pdev" --></div>
+          <div class="left"><!--# echo var="server_domain" default="some" --></div>
          <div class="hash">#</div>
-          <div class="right"><!--# echo var="upstream" default="Studio" --></div>
+          <div class="right">
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
        </div>  
      </div>
      <div class="pure-u-1-1"></div>
--- a/web/files/html/errors/error_403.html
+++ b/web/files/html/errors/error_403.html
@@ -7,15 +7,19 @@
    <link href="/0x90/css/blink.css" rel="stylesheet">
    <link href="/0x90/css/main.css" rel="stylesheet">
    <meta charset="utf-8">
-    <title>pdev Studio</title>
+    <title><!--# echo var="server_domain" default="some" --></title>
  </head>
  <body>
    <div class="pure-g">
      <div class="pure-u-1-1"> 
        <div class="logo">
-          <div class="left"><!--# echo var="server_domain" default="pdev" --></div>
+          <div class="left"><!--# echo var="server_domain" default="some" --></div>
          <div class="hash">#</div>
-          <div class="right"><!--# echo var="upstream" default="Studio" --></div>
+          <div class="right">
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
        </div>  
      </div>
      <div class="pure-u-1-1"></div>
--- a/web/files/html/errors/error_404.html
+++ b/web/files/html/errors/error_404.html
@@ -7,15 +7,19 @@
    <link href="/0x90/css/blink.css" rel="stylesheet">
    <link href="/0x90/css/main.css" rel="stylesheet">
    <meta charset="utf-8">
-    <title>pdev Studio</title>
+    <title><!--# echo var="server_domain" default="some" --></title>
  </head>
  <body>
    <div class="pure-g">
      <div class="pure-u-1-1"> 
        <div class="logo">
-          <div class="left"><!--# echo var="server_domain" default="pdev" --></div>
+          <div class="left"><!--# echo var="server_domain" default="some" --></div>
          <div class="hash">#</div>
-          <div class="right"><!--# echo var="upstream" default="Studio" --></div>
+          <div class="right">
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
        </div>  
      </div>
      <div class="pure-u-1-1"></div>
--- a/web/files/html/errors/error_50x.html
+++ b/web/files/html/errors/error_50x.html
@@ -7,7 +7,7 @@
    <link href="/0x90/css/blink.css" rel="stylesheet">
    <link href="/0x90/css/main.css" rel="stylesheet">
    <meta charset="utf-8">
-    <title>pdev Studio</title>
+    <title><!--# echo var="server_domain" default="some" --></title>
  </head>
  <body>

@@ -15,9 +15,13 @@
    <div class="pure-g">
      <div class="pure-u-1-1"> 
        <div class="logo">
-          <div class="left"><!--# echo var="server_domain" default="pdev" --></div>
+          <div class="left"><!--# echo var="server_domain" default="some" --></div>
          <div class="hash">#</div>
-          <div class="right"><!--# echo var="upstream" default="Studio" --></div>
+          <div class="right">
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
        </div>  
      </div>
      <div class="pure-u-1-1"></div>
--- a/web/files/html/index.html
+++ b/web/files/html/index.html
@@ -16,26 +16,33 @@
        <div class="logo">
          <div class="left"><!--# echo var="server_domain" default="some" --></div>
          <div class="hash">#</div>
-          <div class="right"><!--# echo var="upstream" default="website" --></div>
+          <div class="right">
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
        </div>  
      </div>
      <div class="pure-u-1-1"></div>
      <div class="pure-u-1-1 center-elements vert-70 status-code">
        <div class="pure-g">
-            <div class="pure-u-1-1 code">0x2A</div>
-            <div class="pure-u-1-1 pure-u-md-1-2 center-elements msg">
-                (1/42) installing <!--# echo var="upstream" default="website" -->
-            </div>
-            <div class="pure-u-1-1 pure-u-md-1-2 center-elements msg">
-                [######
-                <div style="top: -13px; position: relative;">
-                    <div class="loader pipe loader-0-3">|</div>
-                    <div class="loader loader-1-3">/</div>
-                    <div class="loader loader-2-3">-</div>
-                    <div class="loader loader-3-3">\</div>
-                </div>
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;] 26%
+          <div class="pure-u-1-1 code">0x2A</div>
+          <div class="pure-u-1-1 pure-u-md-1-2 center-elements msg">
+            (1/42) installing                
+            <!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
+              <!--# echo var="server_name" default="website" -->
+            <!--# endif -->
+          </div>
+          <div class="pure-u-1-1 pure-u-md-1-2 center-elements msg">
+            [######
+            <div style="top: -13px; position: relative;">
+              <div class="loader pipe loader-0-3">|</div>
+              <div class="loader loader-1-3">/</div>
+              <div class="loader loader-2-3">-</div>
+              <div class="loader loader-3-3">\</div>
            </div>
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;] 26%
+          </div>
        </div>
      </div>
   </div>
Author	SHA1	Message	Date
Pascal	da5642b80f	[mod] switched nginx to stable-alpine and updated certbot to 1.16.0	2021-07-02 16:02:59 -04:00
Pascal	e4d912106d	[mod] added regex to strip port from upstream name in html files	2021-02-28 12:08:58 -05:00
Pascal	e16eb6746f	[fix] fixed page title of error pages to be var based in web container	2021-02-28 01:31:06 -05:00
Pascal	229827d525	[fix] fixed wrong ports for proxy	2021-02-28 00:32:54 -05:00
Pascal	14968c78f0	[add] added websocket upgrade mapping to default nginx config	2021-02-27 23:54:16 -05:00