Merge pull request #6 from MattHalloran/dev

Custom 503
MattHalloran · Jul 16, 2024 · d04ea31 · d04ea31
2 parents 4457a07 + 143a011
commit d04ea31
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 13 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,32 @@
+# Force all line endings to be LF, since the project is
+# always ran in a Unix-based environment.
+* text=auto
+* text eol=lf
+
+#
+# The above will handle all files NOT found below
+#
+# These files are text and should be normalized (Convert crlf => lf)
+*.css text
+*.html text
+*.java text
+*.js text
+*.json text
+*.properties text
+*.sh text
+*.ts text
+*.txt text
+*.xml text
+*.conf text
+
+# These files are binary and should be left untouched
+# (binary is macro for -text -diff)
+*.class binary
+*.jar binary
+*.gif binary
+*.jpg binary
+*.png binary
+*.rlib binary
+*.rmeta binary
+*.wasm binary
+*.dylib binary
diff --git a/50x.html b/50x.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Service Unavailable</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            background-color: #222;
+            color: #fff;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+            margin: 0;
+        }
+        .error-container {
+            text-align: center;
+            padding: 20px;
+        }
+        h1 {
+            font-size: 24px;
+            margin-bottom: 20px;
+        }
+        p {
+            font-size: 16px;
+            margin-bottom: 10px;
+        }
+    </style>
+</head>
+<body>
+    <div class="error-container">
+        <h1>Service Temporarily Unavailable</h1>
+        <p>We apologize, but our service is currently undergoing maintenance.</p>
+        <p>Please check back shortly. Thank you for your patience.</p>
+    </div>
+</body>
+</html>
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,36 +3,39 @@ version: '2'
 services:
 
   nginx-proxy:
-    image: jwilder/nginx-proxy:dev
+    image: jwilder/nginx-proxy:1.6.0-alpine
     container_name: nginx-proxy
     ports:
       - "80:80"
       - "443:443"
-    networks:
-      - proxy
     volumes:
       - conf:/etc/nginx/conf.d
-      - ./my_proxy.conf:/etc/nginx/conf.d/my_proxy.conf:ro
       - vhost:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - dhparam:/etc/nginx/dhparam
       - certs:/etc/nginx/certs:ro
       - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ./my_proxy.conf:/etc/nginx/conf.d/my_proxy.conf:ro
+      - ./50x.html:/usr/share/nginx/html/errors/50x.html:ro
+    networks:
+      - proxy
     restart: always
 
-  letsencrypt:
-    image: jrcs/letsencrypt-nginx-proxy-companion
-    container_name: nginx-proxy-le
-    depends_on:
-      - nginx-proxy
+  acme-companion:
+    image: nginxproxy/acme-companion:2.4.0
+    container_name: nginx-proxy-acme
     volumes_from:
       - nginx-proxy
-    networks:
-      - proxy
     volumes:
-      - certs:/etc/nginx/certs
+      - certs:/etc/nginx/certs:rw
       - acme:/etc/acme.sh
       - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      - [email protected]
+    networks:
+      - proxy
+    depends_on:
+      - nginx-proxy
     restart: always
 
 volumes:
@@ -46,4 +49,4 @@ volumes:
 networks:
   proxy:
     external:
-      name: nginx-proxy
+      name: nginx-proxy