Squashed commit of the following:

    * Removed gumroad link
    * Using nginx alpine

diff --git a/Dockerfile b/Dockerfile
index 86dd02d448e225e5c9add98349af3a969a71c573..3ee1ca0a02ff376c13bdb5744e1c9e8af4f176d9 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,4 @@
-FROM nginx:1.17
-
-RUN rm /etc/nginx/conf.d/default.conf
+FROM nginx:1.27-alpine

 
 COPY ./conf.d/ /etc/nginx/conf.d/
 COPY ./www/ /www/
 
 COPY ./conf.d/ /etc/nginx/conf.d/
 COPY ./www/ /www/

diff --git a/conf.d/default.conf b/conf.d/default.conf
new file mode 100644 (file)
index 0000000..9576cbd
--- /dev/null
+++ b/conf.d/default.conf
@@ -0,0 +1,5 @@
+server {
+    location / {
+        root /www;
+    }
+}

diff --git a/conf.d/purplebirdman.conf b/conf.d/purplebirdman.conf
deleted file mode 100644 (file)
index 9576cbd..0000000
--- a/conf.d/purplebirdman.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-server {
-    location / {
-        root /www;
-    }
-}

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index 6b0bcc7ddd789d07e613a926567bd62f1d4ca2b1..0b89c58c2b45ad0afd63946af84dcbbde4d205e0 100644 (file)
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -4,7 +4,7 @@ networks:
         external: true
 services:
     web:
         external: true
 services:
     web:

-        image: cjpalmer/purplebirdman:1.1.0
+        image: cjpalmer/purplebirdman:1.2.0

         environment:
         - NGINX_HOST=purplebirdman.com
         - NGINX_PORT=80
         environment:
         - NGINX_HOST=purplebirdman.com
         - NGINX_PORT=80

diff --git a/docker-compose.yml b/docker-compose.yml
index 4e9fb06de5d9231de8cd2886d2e569347d7f8dfd..13dc24ff576e901c83b8a56401b91eef6ec97889 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
     web:
         build: .
 services:
     web:
         build: .

-        image: cjpalmer/purplebirdman:1.1.0
+        image: cjpalmer/purplebirdman:1.2.0

         environment:
         - NGINX_HOST=purplebirdman.com
         - NGINX_PORT=80
         environment:
         - NGINX_HOST=purplebirdman.com
         - NGINX_PORT=80

diff --git a/www/index.html b/www/index.html
index dedcb7599ba65d095a6ef79b5a15f5db5934139e..60ba5516c200d8f87f6c34c844d4e00c3c501789 100644 (file)
--- a/www/index.html
+++ b/www/index.html
@@ -39,7 +39,6 @@
         <h2>Want to support my comics?</h2>
         <li class="link fourth-color"><a target="_blank" href="https://patreon.com/purplebirdman">Patreon</a></li>
         <li class="link fourth-color"><a target="_blank" href="https://subscribestar.adult/purplebirdman">SubscribeStar</a></li>
         <h2>Want to support my comics?</h2>
         <li class="link fourth-color"><a target="_blank" href="https://patreon.com/purplebirdman">Patreon</a></li>
         <li class="link fourth-color"><a target="_blank" href="https://subscribestar.adult/purplebirdman">SubscribeStar</a></li>

-        <li class="link fourth-color"><a target="_blank" href="https://thepurplebirdman.gumroad.com">Gumroad</a></li>

         <li class="link fourth-color"><a target="_blank" href="https://purplebirdman.itch.io/">itch.io</a></li>
         </center>
     </div>
         <li class="link fourth-color"><a target="_blank" href="https://purplebirdman.itch.io/">itch.io</a></li>
         </center>
     </div>