Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
e05ebfbb52
7 changed files with 14 additions and 14 deletions
|
@ -1,7 +1,7 @@
|
||||||
FROM alpine:3.9 as alpine
|
FROM alpine:3.11 as alpine
|
||||||
RUN apk add -U --no-cache ca-certificates
|
RUN apk add -U --no-cache ca-certificates
|
||||||
|
|
||||||
FROM alpine:3.9
|
FROM alpine:3.11
|
||||||
ENV GODEBUG netdns=go
|
ENV GODEBUG netdns=go
|
||||||
ENV DRONE_RUNNER_OS=linux
|
ENV DRONE_RUNNER_OS=linux
|
||||||
ENV DRONE_RUNNER_ARCH=amd64
|
ENV DRONE_RUNNER_ARCH=amd64
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
FROM alpine:3.9 as alpine
|
FROM alpine:3.11 as alpine
|
||||||
RUN apk add -U --no-cache ca-certificates
|
RUN apk add -U --no-cache ca-certificates
|
||||||
|
|
||||||
FROM alpine:3.9
|
FROM alpine:3.11
|
||||||
ENV GODEBUG netdns=go
|
ENV GODEBUG netdns=go
|
||||||
ENV DRONE_RUNNER_OS=linux
|
ENV DRONE_RUNNER_OS=linux
|
||||||
ENV DRONE_RUNNER_ARCH=amd64
|
ENV DRONE_RUNNER_ARCH=amd64
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
FROM alpine:3.9 as alpine
|
FROM alpine:3.11 as alpine
|
||||||
RUN apk add -U --no-cache ca-certificates
|
RUN apk add -U --no-cache ca-certificates
|
||||||
|
|
||||||
FROM alpine:3.9
|
FROM alpine:3.11
|
||||||
ENV GODEBUG=netdns=go
|
ENV GODEBUG=netdns=go
|
||||||
ENV DRONE_RUNNER_OS=linux
|
ENV DRONE_RUNNER_OS=linux
|
||||||
ENV DRONE_RUNNER_ARCH=arm
|
ENV DRONE_RUNNER_ARCH=arm
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
FROM alpine:3.9 as alpine
|
FROM alpine:3.11 as alpine
|
||||||
RUN apk add -U --no-cache ca-certificates
|
RUN apk add -U --no-cache ca-certificates
|
||||||
|
|
||||||
FROM alpine:3.9
|
FROM alpine:3.11
|
||||||
ENV GODEBUG=netdns=go
|
ENV GODEBUG=netdns=go
|
||||||
ENV DRONE_RUNNER_OS=linux
|
ENV DRONE_RUNNER_OS=linux
|
||||||
ENV DRONE_RUNNER_ARCH=arm64
|
ENV DRONE_RUNNER_ARCH=arm64
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
# docker build --rm -f docker/Dockerfile -t drone/drone .
|
# 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
|
RUN apk add -U --no-cache ca-certificates
|
||||||
|
|
||||||
FROM alpine:3.9
|
FROM alpine:3.11
|
||||||
EXPOSE 80 443
|
EXPOSE 80 443
|
||||||
VOLUME /data
|
VOLUME /data
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
# docker build --rm -f docker/Dockerfile -t drone/drone .
|
# 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
|
RUN apk add -U --no-cache ca-certificates
|
||||||
|
|
||||||
FROM alpine:3.9
|
FROM alpine:3.11
|
||||||
EXPOSE 80 443
|
EXPOSE 80 443
|
||||||
VOLUME /data
|
VOLUME /data
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
# docker build --rm -f docker/Dockerfile -t drone/drone .
|
# 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
|
RUN apk add -U --no-cache ca-certificates
|
||||||
|
|
||||||
FROM alpine:3.9
|
FROM alpine:3.11
|
||||||
EXPOSE 80 443
|
EXPOSE 80 443
|
||||||
VOLUME /data
|
VOLUME /data
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue