Compare commits
12 Commits
Author | SHA1 | Date | |
---|---|---|---|
f0586e3af4 | |||
f222c7f241 | |||
a701b7f717 | |||
99bd881adf | |||
1d936181e7 | |||
33a63cf4aa | |||
484b4d6f16 | |||
0f5aa75b90 | |||
af677e150f | |||
7748886a37 | |||
60f2183c81 | |||
5d57259aef |
@ -11,9 +11,9 @@ steps:
|
|||||||
password:
|
password:
|
||||||
from_secret: docker_password
|
from_secret: docker_password
|
||||||
auto_tag: true
|
auto_tag: true
|
||||||
repo: hibas123.azurecr.io/caddy
|
repo: docker.hibas123.de/caddy
|
||||||
registry: hibas123.azurecr.io
|
registry: docker.hibas123.de
|
||||||
debug: true
|
debug: false
|
||||||
when:
|
when:
|
||||||
branch: [master]
|
branch: [master]
|
||||||
event:
|
event:
|
||||||
|
42
Dockerfile
42
Dockerfile
@ -1,22 +1,33 @@
|
|||||||
FROM caddy:builder AS builder
|
ARG version=2.4.1
|
||||||
|
|
||||||
RUN caddy-builder \
|
FROM golang:1.16-alpine3.13 AS builder
|
||||||
github.com/caddy-dns/cloudflare
|
ARG version
|
||||||
|
|
||||||
FROM caddy:2.0.0
|
WORKDIR /src
|
||||||
|
|
||||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
RUN apk add --no-cache \
|
||||||
|
git \
|
||||||
|
ca-certificates
|
||||||
|
|
||||||
|
RUN go get -u github.com/caddyserver/xcaddy/cmd/xcaddy
|
||||||
|
|
||||||
|
ENV CADDY_VERSION="v${version}"
|
||||||
|
RUN xcaddy build --with github.com/caddy-dns/cloudflare --output /usr/bin/caddy
|
||||||
|
|
||||||
|
RUN /usr/bin/caddy version
|
||||||
|
|
||||||
|
FROM alpine:3
|
||||||
LABEL maintainer "Fabian Stamm <dev@fabianstamm.de>"
|
LABEL maintainer "Fabian Stamm <dev@fabianstamm.de>"
|
||||||
|
|
||||||
# RUN apk add --no-cache \
|
RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.9/community >> /etc/apk/repositories
|
||||||
# ca-certificates \
|
RUN apk add --no-cache openssl libxml2 php7 php7-fpm php7-opcache php7-curl php7-ctype php7-dom php7-gd php7-iconv \
|
||||||
# git \
|
php7-json php7-xml php7-mbstring php7-openssl php7-posix php7-session php7-simplexml php7-xmlreader php7-xmlwriter \
|
||||||
# mailcap \
|
php7-zip php7-zlib php7-pdo_sqlite php7-pdo_mysql php7-pdo_pgsql php7-fileinfo php7-bz2 php7-intl php7-ldap \
|
||||||
# openssh-client \
|
php7-ftp php7-imap php7-bcmath php7-gmp php7-exif
|
||||||
# tzdata \
|
|
||||||
# bash \
|
RUN cat /etc/php7/php-fpm.d/www.conf | sed 's/listen = 127.0.0.1:9000/listen = \/run\/php-fpm.sock/g' > /etc/php7/php-fpm.d/www.conf
|
||||||
# curl
|
|
||||||
|
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||||
|
|
||||||
|
|
||||||
#Validate install
|
#Validate install
|
||||||
@ -31,4 +42,7 @@ WORKDIR /srv
|
|||||||
|
|
||||||
COPY Caddyfile /etc/Caddyfile
|
COPY Caddyfile /etc/Caddyfile
|
||||||
|
|
||||||
CMD ["caddy", "run", "--config", "/etc/Caddyfile", "--adapter", "caddyfile"]
|
COPY start.sh /start.sh
|
||||||
|
RUN chmod +x /start.sh
|
||||||
|
|
||||||
|
CMD ["/bin/sh", "/start.sh"]
|
||||||
|
Reference in New Issue
Block a user