Merge pull request #2232 from bradrydzewski/master

provide alpine-based images
This commit is contained in:
Brad Rydzewski 2017-09-27 19:11:57 -07:00 committed by GitHub
commit 4fb589d61f
7 changed files with 50 additions and 6 deletions

View file

@ -37,6 +37,15 @@ pipeline:
when:
event: [ push, tag ]
publish_server_alpine:
image: plugins/docker
repo: drone/drone
secrets: [ docker_username, docker_password ]
tag: [ alpine ]
when:
branch: master
event: push
publish_server:
image: plugins/docker
repo: drone/drone
@ -46,6 +55,16 @@ pipeline:
branch: master
event: push
publish_agent_alpine:
image: plugins/docker
repo: drone/agent
dockerfile: Dockerfile.agent.alpine
secrets: [ docker_username, docker_password ]
tag: [ alpine ]
when:
branch: master
event: push
publish_agent_arm:
image: plugins/docker
repo: drone/agent
@ -80,7 +99,7 @@ pipeline:
image: plugins/docker
repo: drone/drone
secrets: [ docker_username, docker_password ]
tag: [ 0.8, 0.8.0 ]
tag: [ 0.8, 0.8.1 ]
when:
event: tag
@ -89,7 +108,7 @@ pipeline:
repo: drone/agent
dockerfile: Dockerfile.agent
secrets: [ docker_username, docker_password ]
tag: [ 0.8, 0.8.0 ]
tag: [ 0.8, 0.8.1 ]
when:
event: tag

View file

@ -1,6 +1,6 @@
# docker build --rm -f Dockerfile.agent -t drone/agent .
FROM centurylink/ca-certs
FROM drone/ca-certs
ENV GODEBUG=netdns=go
ADD release/drone-agent /bin/

12
Dockerfile.agent.alpine Normal file
View file

@ -0,0 +1,12 @@
FROM alpine:3.6
RUN apk add -U --no-cache ca-certificates
ENV GODEBUG=netdns=go
ADD release/drone-agent /bin/
EXPOSE 3000
HEALTHCHECK CMD ["/bin/drone-agent", "ping"]
ENTRYPOINT ["/bin/drone-agent"]

View file

@ -1,4 +1,4 @@
FROM centurylink/ca-certs
FROM drone/ca-certs
ENV GODEBUG=netdns=go
ENV DRONE_PLATFORM=linux/arm
ADD release/linux/arm/drone-agent /bin/

View file

@ -1,4 +1,4 @@
FROM centurylink/ca-certs
FROM drone/ca-certs
ENV GODEBUG=netdns=go
ENV DRONE_PLATFORM=linux/arm64
ADD release/linux/arm64/drone-agent /bin/

13
Dockerfile.alpine Normal file
View file

@ -0,0 +1,13 @@
FROM alpine:3.6
EXPOSE 8000 9000 80 443
RUN apk add -U --no-cache ca-certificates
ENV DATABASE_DRIVER=sqlite3
ENV DATABASE_CONFIG=/var/lib/drone/drone.sqlite
ENV GODEBUG=netdns=go
ENV XDG_CACHE_HOME /var/lib/drone
ADD release/drone-server /bin/
ENTRYPOINT ["/bin/drone-server"]

View file

@ -8,7 +8,7 @@ var (
// VersionMinor is for functionality in a backwards-compatible manner.
VersionMinor int64 = 8
// VersionPatch is for backwards-compatible bug fixes.
VersionPatch int64 = 0
VersionPatch int64 = 1
// VersionPre indicates prerelease.
VersionPre string
// VersionDev indicates development branch. Releases will be empty string.