Skip to content

Commit

Permalink
Alpine 3.10 (#7256)
Browse files Browse the repository at this point in the history
  • Loading branch information
techknowlogick authored Jun 20, 2019
1 parent de9b398 commit 8db4541
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pipeline:
branch: [ master ]

update-translations:
image: alpine:3.7
image: alpine:3.10
commands:
- mv ./options/locale/locale_en-US.ini ./options/
- sed -i -e 's/="/=/g' -e 's/"$$//g' ./options/locale/*.ini
Expand Down Expand Up @@ -163,7 +163,7 @@ pipeline:
event: [ tag ]

test-mysql8:
image: golang:1.11
image: golang:1.12
pull: true
group: test
environment:
Expand Down Expand Up @@ -294,7 +294,7 @@ pipeline:
branch: [ master ]

docker-dryrun:
image: plugins/docker:17.12
image: plugins/docker:18.09
pull: true
repo: gitea/gitea
cache_from: gitea/gitea
Expand All @@ -303,7 +303,7 @@ pipeline:
event: [ pull_request ]

release-docker:
image: plugins/docker:17.12
image: plugins/docker:18.09
pull: true
secrets: [ docker_username, docker_password ]
repo: gitea/gitea
Expand All @@ -314,7 +314,7 @@ pipeline:
branch: [ release/* ]

docker:
image: plugins/docker:17.12
image: plugins/docker:18.09
secrets: [ docker_username, docker_password ]
pull: true
repo: gitea/gitea
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

###################################
#Build stage
FROM golang:1.12-alpine3.9 AS build-env
FROM golang:1.12-alpine3.10 AS build-env

ARG GITEA_VERSION
ARG TAGS="sqlite sqlite_unlock_notify"
Expand All @@ -18,7 +18,7 @@ WORKDIR ${GOPATH}/src/code.gitea.io/gitea
RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
&& make clean generate build

FROM alpine:3.9
FROM alpine:3.10
LABEL maintainer="maintainers@gitea.io"

EXPOSE 22 3000
Expand Down

0 comments on commit 8db4541

Please sign in to comment.