Skip to content

Commit

Permalink
Update Dockerfile to use the Caddy builder image with the specified t…
Browse files Browse the repository at this point in the history
…ag and remove unnecessary package installations and key setup steps.
  • Loading branch information
nsouto committed Oct 31, 2023
1 parent 778c660 commit c900e8a
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions caddy-octane/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG OCTANE_TAG=latest
ARG CADDY_TAG=latest
ARG CADDY_BUILDER_TAG=builder

FROM caddy:builder AS builder
FROM caddy:${CADDY_BUILDER_TAG} AS builder

RUN xcaddy build \
--with github.com/silinternational/certmagic-storage-dynamodb/v3 \
Expand All @@ -21,14 +21,6 @@ ARG CADDY_ORIGIN_URL

ENV CADDY_ORIGIN_URL=${CADDY_ORIGIN_URL}

RUN apt-get update; \
apt-get upgrade -yqq; \
apt-get install -yqq --no-install-recommends --show-progress debian-keyring debian-archive-keyring apt-transport-https gpg; \
curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg; \
curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | tee /etc/apt/sources.list.d/caddy-stable.list; \
apt-get update; \
apt-get install -yqq --no-install-recommends --show-progress caddy;

COPY --from=builder /usr/bin/caddy /usr/bin/caddy

COPY ./etc/supervisor/ /etc/supervisor/
Expand Down

0 comments on commit c900e8a

Please sign in to comment.