From 2d72dde62b0ee72b84c5348a780f9e15120bbfb6 Mon Sep 17 00:00:00 2001 From: Warren Gifford Date: Fri, 23 Jul 2021 14:29:40 -0700 Subject: [PATCH 1/3] Update Caddy Image in docker-compose.yaml Updates Caddy image to caddy 2.0.0-alpine sha256:83d9aa7a5f1bbcc0fc1b4720c183a5ec53dae7dc5d9fa555daf3db345010e7f9 --- docker-compose/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index 207e4cadc..5fe99a5d1 100644 --- a/docker-compose/docker-compose.yaml +++ b/docker-compose/docker-compose.yaml @@ -17,7 +17,7 @@ services: # https://caddyserver.com/docs/caddyfile caddy: container_name: caddy - image: 'index.docker.io/caddy/caddy:alpine@sha256:ef2f47730caa12cb7d0ba944c048b8e48f029d5e0ff861840fa2b8f1868e1966' + image: 'index.docker.io/caddy/caddy:alpine@sha256:83d9aa7a5f1bbcc0fc1b4720c183a5ec53dae7dc5d9fa555daf3db345010e7f9' cpus: 4 mem_limit: '4g' environment: From 42c299cf905a18cd842e461a48da348e760efc46 Mon Sep 17 00:00:00 2001 From: Warren Gifford Date: Fri, 23 Jul 2021 14:33:20 -0700 Subject: [PATCH 2/3] Change image in deploy script update image in deploy script to caddy/caddy 2.0.0-alpine --- deploy-caddy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy-caddy.sh b/deploy-caddy.sh index a0c1b2c42..920f10211 100755 --- a/deploy-caddy.sh +++ b/deploy-caddy.sh @@ -32,5 +32,5 @@ docker run --detach \ -p 0.0.0.0:443:443 \ -v $VOLUME:/caddy-storage \ --mount type=bind,source="$(pwd)"/caddy/builtins/http.Caddyfile,target=/etc/caddy/Caddyfile \ - index.docker.io/caddy/caddy:alpine@sha256:ef2f47730caa12cb7d0ba944c048b8e48f029d5e0ff861840fa2b8f1868e1966 + index.docker.io/caddy/caddy:alpine@sha256:83d9aa7a5f1bbcc0fc1b4720c183a5ec53dae7dc5d9fa555daf3db345010e7f9 From b3bd1c3ef75bb7fceed71b2f1ac6e0e531a04d9f Mon Sep 17 00:00:00 2001 From: Warren Gifford Date: Mon, 2 Aug 2021 14:16:18 -0700 Subject: [PATCH 3/3] fixing merge conflict, adds /../ Adds /../ --mount type=bind,source="$(pwd)"/../caddy/builtins/http.Caddyfile,target=/etc/caddy/Caddyfile \ index.docker.io/caddy/caddy:alpine@sha256:83d9aa7a5f1bbcc0fc1b4720c183a5ec53dae7dc5d9fa555daf3db345010e7f9 --- deploy-caddy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy-caddy.sh b/deploy-caddy.sh index 920f10211..8da24e295 100755 --- a/deploy-caddy.sh +++ b/deploy-caddy.sh @@ -31,6 +31,6 @@ docker run --detach \ -p 0.0.0.0:80:80 \ -p 0.0.0.0:443:443 \ -v $VOLUME:/caddy-storage \ - --mount type=bind,source="$(pwd)"/caddy/builtins/http.Caddyfile,target=/etc/caddy/Caddyfile \ + --mount type=bind,source="$(pwd)"/../caddy/builtins/http.Caddyfile,target=/etc/caddy/Caddyfile \ index.docker.io/caddy/caddy:alpine@sha256:83d9aa7a5f1bbcc0fc1b4720c183a5ec53dae7dc5d9fa555daf3db345010e7f9