Skip to content

Commit 0763df2

Browse files
author
Josh Wood
authored
Dockerfile: Replace CMD with ENTRYPOINT (#43)
ENTRYPOINT allows passing options directly into the container on docker run. Omitting CMD for default options maintains ideal caddy and current caddybox behavior. Update version strings for release of v0.10.7-cb.1. Fixes #41.
1 parent bc45326 commit 0763df2

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ MAINTAINER Josh Wood <j@joshix.com>
33
COPY rootfs /
44
EXPOSE 80 443 2015
55
WORKDIR /var/www/html
6-
CMD ["/bin/caddy"]
6+
ENTRYPOINT ["/bin/caddy"]

caddy-rkt.service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Delegate=true
1717
#Environment=STORAGE_PATH=/opt/myapp
1818
#Environment=TMPDIR=/var/tmp
1919
# Fetch the image. Superfluous - rkt run will fetch images that don't exist.
20-
ExecStartPre=/usr/bin/rkt fetch --insecure-options=image docker://quay.io/josh_wood/caddy:v0.10.7
20+
ExecStartPre=/usr/bin/rkt fetch --insecure-options=image docker://quay.io/josh_wood/caddy:v0.10.7-cb.1
2121
# Start the app
2222
ExecStart=/usr/bin/rkt run --insecure-options=image \
2323
--port 80-tcp:80 --port 443-tcp:443 --port 2015-tcp:2015 \
@@ -26,7 +26,7 @@ ExecStart=/usr/bin/rkt run --insecure-options=image \
2626
--mount volume=html,target=/var/www/html \
2727
--volume dotcaddy,kind=host,source=/home/core/dotcaddy,readOnly=false \
2828
--mount volume=dotcaddy,target=/root/.caddy \
29-
docker://quay.io/josh_wood/caddy:v0.10.7
29+
docker://quay.io/josh_wood/caddy:v0.10.7-cb.1
3030
KillMode=mixed
3131
Restart=always
3232

rkt-run.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ rkt run --insecure-options=image \
2626
--mount volume=html,target=/var/www/html \
2727
--volume dotcaddy,kind=host,source=/home/core/dotcaddy,readOnly=false \
2828
--mount volume=dotcaddy,target=/root/.caddy \
29-
docker://quay.io/josh_wood/caddy:v0.10.7
29+
docker://quay.io/josh_wood/caddy:v0.10.7-cb.1
3030
```
3131

3232

0 commit comments

Comments
 (0)