diff --git a/docker/Dockerfile.agent.linux.amd64 b/docker/Dockerfile.agent.linux.amd64 index bb9899a88..a13e86fdf 100644 --- a/docker/Dockerfile.agent.linux.amd64 +++ b/docker/Dockerfile.agent.linux.amd64 @@ -1,7 +1,7 @@ -FROM alpine:3.11 as alpine +FROM alpine:3.19 as alpine RUN apk add -U --no-cache ca-certificates tzdata -FROM alpine:3.11 +FROM alpine:3.19 ENV GODEBUG netdns=go ENV DRONE_RUNNER_OS=linux ENV DRONE_RUNNER_ARCH=amd64 @@ -9,7 +9,7 @@ ENV DRONE_RUNNER_PLATFORM=linux/amd64 ENV DRONE_RUNNER_CAPACITY=1 ADD release/linux/amd64/drone-agent /bin/ -RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf +RUN if [[ ! -e /etc/nsswitch.conf ]] ; then echo 'hosts: files dns' > /etc/nsswitch.conf ; fi COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo diff --git a/docker/Dockerfile.controller.linux.amd64 b/docker/Dockerfile.controller.linux.amd64 index 8161dc2cc..6d2a41726 100644 --- a/docker/Dockerfile.controller.linux.amd64 +++ b/docker/Dockerfile.controller.linux.amd64 @@ -1,7 +1,7 @@ -FROM alpine:3.11 as alpine +FROM alpine:3.19 as alpine RUN apk add -U --no-cache ca-certificates tzdata -FROM alpine:3.11 +FROM alpine:3.19 ENV GODEBUG netdns=go ENV DRONE_RUNNER_OS=linux ENV DRONE_RUNNER_ARCH=amd64 diff --git a/docker/Dockerfile.server.linux.amd64 b/docker/Dockerfile.server.linux.amd64 index 1f4d604b1..2a9457ad7 100644 --- a/docker/Dockerfile.server.linux.amd64 +++ b/docker/Dockerfile.server.linux.amd64 @@ -1,13 +1,13 @@ # docker build --rm -f docker/Dockerfile -t drone/drone . -FROM alpine:3.11 as alpine +FROM alpine:3.19 as alpine RUN apk add -U --no-cache ca-certificates tzdata -FROM alpine:3.11 +FROM alpine:3.19 EXPOSE 80 443 VOLUME /data -RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf +RUN if [[ ! -e /etc/nsswitch.conf ]] ; then echo 'hosts: files dns' > /etc/nsswitch.conf ; fi ENV GODEBUG netdns=go ENV XDG_CACHE_HOME /data