Skip to content

Commit

Permalink
Caddy v1.0.5: New binary. New ca-certs. Delete rkt.
Browse files Browse the repository at this point in the history
rootfs/bin/caddy: Caddy v1.0.5 built with go1.14.
README: Improve accuracy of example ports.
rkt/*: Delete rkt files after rkt EOL.
ca-certs: Update with file from fedora31.
  • Loading branch information
joshix committed Mar 6, 2020
1 parent a7a6f15 commit 9f51a56
Show file tree
Hide file tree
Showing 6 changed files with 1,011 additions and 1,471 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM scratch
LABEL maintainer="Josh Wood <[email protected]>"
LABEL caddy_version="1.0.0"
LABEL caddy_version="1.0.5"
COPY rootfs /
USER 65534:65534
EXPOSE 8080
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ $ ls /home/j/site
index.html
img/
[...]
$ docker run -d -p 8080:2015 -v /home/j/site:/var/www/html:ro joshix/caddy
$ docker run -d -p 8080:8080 -v /home/j/site:/var/www/html:ro joshix/caddy
```

OR,
Expand All @@ -49,7 +49,7 @@ $ cat Dockerfile
FROM joshix/caddy
COPY . /var/www/html
$ docker build -t "com.mysite-caddy" .
$ docker run -d -p 8080:2015 com.mysite-caddy
$ docker run -d -p 8080:8080 com.mysite-caddy
```

## Configuration
Expand All @@ -63,12 +63,12 @@ $ ls /home/j/site
img/
[...]
$ cat /home/j/site/Caddyfile
0.0.0.0:2015
0.0.0.0:8080
ext .html .htm .md
markdown /
gzip
[...]
$ docker run -d -p 8080:2015 -v /home/j/site:/var/www/html:ro joshix/caddy
$ docker run -d -p 8080:8080 -v /home/j/site:/var/www/html:ro joshix/caddy
```

### Manual TLS
Expand All @@ -88,14 +88,14 @@ $ ls /home/j/site/tls
site.crt
site.key
$ cat /home/j/site/html/Caddyfile
0.0.0.0:2015 {
0.0.0.0:8080 {
redir https://site.com # Redirect any HTTP req to HTTPS
}
0.0.0.0:2378 {
0.0.0.0:443 {
tls ../tls/site.crt ../tls/site.key
}
[...]
$ docker run -d -p 80:2015 -p 443:2378 -v /home/j/site:/var/www:ro joshix/caddy
$ docker run -d -p 80:8080 -p 443:443 -v /home/j/site:/var/www:ro joshix/caddy
```

### Automatic *Let's Encrypt* TLS
Expand Down
34 changes: 0 additions & 34 deletions rkt/caddy-rkt.service

This file was deleted.

35 changes: 0 additions & 35 deletions rkt/rkt-run.md

This file was deleted.

Binary file modified rootfs/bin/caddy
Binary file not shown.
Loading

0 comments on commit 9f51a56

Please sign in to comment.