Merge remote-tracking branch 'origin/master'

This commit is contained in:
Brad Rydzewski 2020-01-29 08:49:54 -08:00
commit e05ebfbb52
7 changed files with 14 additions and 14 deletions

View file

@ -1,7 +1,7 @@
FROM alpine:3.9 as alpine
FROM alpine:3.11 as alpine
RUN apk add -U --no-cache ca-certificates
FROM alpine:3.9
FROM alpine:3.11
ENV GODEBUG netdns=go
ENV DRONE_RUNNER_OS=linux
ENV DRONE_RUNNER_ARCH=amd64

View file

@ -1,7 +1,7 @@
FROM alpine:3.9 as alpine
FROM alpine:3.11 as alpine
RUN apk add -U --no-cache ca-certificates
FROM alpine:3.9
FROM alpine:3.11
ENV GODEBUG netdns=go
ENV DRONE_RUNNER_OS=linux
ENV DRONE_RUNNER_ARCH=amd64

View file

@ -1,7 +1,7 @@
FROM alpine:3.9 as alpine
FROM alpine:3.11 as alpine
RUN apk add -U --no-cache ca-certificates
FROM alpine:3.9
FROM alpine:3.11
ENV GODEBUG=netdns=go
ENV DRONE_RUNNER_OS=linux
ENV DRONE_RUNNER_ARCH=arm

View file

@ -1,7 +1,7 @@
FROM alpine:3.9 as alpine
FROM alpine:3.11 as alpine
RUN apk add -U --no-cache ca-certificates
FROM alpine:3.9
FROM alpine:3.11
ENV GODEBUG=netdns=go
ENV DRONE_RUNNER_OS=linux
ENV DRONE_RUNNER_ARCH=arm64

View file

@ -1,9 +1,9 @@
# docker build --rm -f docker/Dockerfile -t drone/drone .
FROM alpine:3.9 as alpine
FROM alpine:3.11 as alpine
RUN apk add -U --no-cache ca-certificates
FROM alpine:3.9
FROM alpine:3.11
EXPOSE 80 443
VOLUME /data

View file

@ -1,9 +1,9 @@
# docker build --rm -f docker/Dockerfile -t drone/drone .
FROM alpine:3.9 as alpine
FROM alpine:3.11 as alpine
RUN apk add -U --no-cache ca-certificates
FROM alpine:3.9
FROM alpine:3.11
EXPOSE 80 443
VOLUME /data

View file

@ -1,9 +1,9 @@
# docker build --rm -f docker/Dockerfile -t drone/drone .
FROM alpine:3.9 as alpine
FROM alpine:3.11 as alpine
RUN apk add -U --no-cache ca-certificates
FROM alpine:3.9
FROM alpine:3.11
EXPOSE 80 443
VOLUME /data