Skip to content

Commit ab267a5

Browse files
willdollmanevict
andauthored
Update caddy to 2.7.6 to patch several vulns (#975)
* Update caddy to 2.7.6 to patch several vulns Checked release notes for major changes and tested locally with `./docker-compose/dev/run.sh up` * Quote variable Co-authored-by: Vincent <[email protected]> --------- Co-authored-by: Vincent <[email protected]>
1 parent f62da67 commit ab267a5

File tree

2 files changed

+29
-30
lines changed

2 files changed

+29
-30
lines changed

docker-compose/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ services:
6969
# https://caddyserver.com/docs/caddyfile
7070
caddy:
7171
container_name: caddy
72-
image: 'index.docker.io/caddy:2.7.4-alpine@sha256:3d1bf053476f2415b40e728c37e1112ee7551fa154a63d6f62b275c13fea8166'
72+
image: 'index.docker.io/caddy:2.7.6-alpine@sha256:80ca561981768b2c3568cc4bef3d4cd1f11c2a625c806bedeb8453aef98779a0'
7373
cpus: 4
7474
mem_limit: '4g'
7575
environment:

pure-docker/deploy-caddy.sh

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,35 @@
11
#!/usr/bin/env bash
22
set -e
33

4-
# Description: Acts as a reverse proxy for all of the sourcegraph-frontend instances
5-
#
6-
# Disk: 1GB / persistent SSD
7-
# Ports exposed to other Sourcegraph services: none
8-
# Ports exposed to the public internet: 80 (HTTP) and 443 (HTTPS)
9-
#
10-
# Sourcegraph ships with a few builtin templates that cover common HTTP/HTTPS configurations:
11-
# - HTTP only (default)
12-
# - HTTPS with Let's Encrypt
13-
# - HTTPS with custom certificates
14-
#
15-
# Follow the directions in the comments below to swap between these configurations.
16-
#
17-
# If none of these built-in configurations suit your needs, then you can create your own Caddyfile, see:
18-
# https://caddyserver.com/docs/caddyfile
4+
# Description: Acts as a reverse proxy for all of the sourcegraph-frontend instances
5+
#
6+
# Disk: 1GB / persistent SSD
7+
# Ports exposed to other Sourcegraph services: none
8+
# Ports exposed to the public internet: 80 (HTTP) and 443 (HTTPS)
9+
#
10+
# Sourcegraph ships with a few builtin templates that cover common HTTP/HTTPS configurations:
11+
# - HTTP only (default)
12+
# - HTTPS with Let's Encrypt
13+
# - HTTPS with custom certificates
14+
#
15+
# Follow the directions in the comments below to swap between these configurations.
16+
#
17+
# If none of these built-in configurations suit your needs, then you can create your own Caddyfile, see:
18+
# https://caddyserver.com/docs/caddyfile
1919

2020
VOLUME="$HOME/sourcegraph-docker/caddy-storage"
2121
./ensure-volume.sh $VOLUME 100
2222
docker run --detach \
23-
--name=caddy \
24-
--network=sourcegraph \
25-
--restart=always \
26-
--cpus="4" \
27-
--memory=4g \
28-
-e XDG_DATA_HOME="/caddy-storage/data" \
29-
-e XDG_CONFIG_HOME="/caddy-storage/config" \
30-
-e SRC_FRONTEND_ADDRESSES="sourcegraph-frontend-0:3080" \
31-
-p 0.0.0.0:80:80 \
32-
-p 0.0.0.0:443:443 \
33-
-v $VOLUME:/caddy-storage \
34-
--mount type=bind,source="$(pwd)"/../caddy/builtins/http.Caddyfile,target=/etc/caddy/Caddyfile \
35-
index.docker.io/caddy:2.7.4-alpine@sha256:3d1bf053476f2415b40e728c37e1112ee7551fa154a63d6f62b275c13fea8166
36-
23+
--name=caddy \
24+
--network=sourcegraph \
25+
--restart=always \
26+
--cpus="4" \
27+
--memory=4g \
28+
-e XDG_DATA_HOME="/caddy-storage/data" \
29+
-e XDG_CONFIG_HOME="/caddy-storage/config" \
30+
-e SRC_FRONTEND_ADDRESSES="sourcegraph-frontend-0:3080" \
31+
-p 0.0.0.0:80:80 \
32+
-p 0.0.0.0:443:443 \
33+
-v "$VOLUME:/caddy-storage" \
34+
--mount type=bind,source="$(pwd)"/../caddy/builtins/http.Caddyfile,target=/etc/caddy/Caddyfile \
35+
index.docker.io/caddy:2.7.6-alpine@sha256:80ca561981768b2c3568cc4bef3d4cd1f11c2a625c806bedeb8453aef98779a0

0 commit comments

Comments
 (0)