From: Clifton Palmer Date: Sun, 15 Dec 2024 18:02:12 +0000 (-0600) Subject: Squashed commit of the following: X-Git-Tag: 1.2.0 X-Git-Url: http://git.purplebirdman.com/purplebirdman.git/commitdiff_plain/refs/heads/master?ds=sidebyside Squashed commit of the following: * Removed gumroad link * Using nginx alpine --- diff --git a/Dockerfile b/Dockerfile index 86dd02d..3ee1ca0 100644 --- 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/ diff --git a/conf.d/default.conf b/conf.d/default.conf new file mode 100644 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 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 6b0bcc7..0b89c58 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -4,7 +4,7 @@ networks: external: true services: web: - image: cjpalmer/purplebirdman:1.1.0 + image: cjpalmer/purplebirdman:1.2.0 environment: - NGINX_HOST=purplebirdman.com - NGINX_PORT=80 diff --git a/docker-compose.yml b/docker-compose.yml index 4e9fb06..13dc24f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: web: build: . - image: cjpalmer/purplebirdman:1.1.0 + image: cjpalmer/purplebirdman:1.2.0 environment: - NGINX_HOST=purplebirdman.com - NGINX_PORT=80 diff --git a/www/index.html b/www/index.html index dedcb75..60ba551 100644 --- a/www/index.html +++ b/www/index.html @@ -39,7 +39,6 @@

Want to support my comics?

-