Skip to content

Commit 1a5ebbb

Browse files
techknowlogickaswild
authored andcommitted
Alpine 3.10 (go-gitea#7256)
1 parent fa2786a commit 1a5ebbb

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.drone.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pipeline:
2121
branch: [ master ]
2222

2323
update-translations:
24-
image: alpine:3.7
24+
image: alpine:3.10
2525
commands:
2626
- mv ./options/locale/locale_en-US.ini ./options/
2727
- sed -i -e 's/="/=/g' -e 's/"$$//g' ./options/locale/*.ini
@@ -164,7 +164,7 @@ pipeline:
164164
event: [ tag ]
165165

166166
test-mysql8:
167-
image: golang:1.11
167+
image: golang:1.12
168168
pull: true
169169
group: test
170170
environment:
@@ -297,7 +297,7 @@ pipeline:
297297
branch: [ master ]
298298

299299
docker-dryrun:
300-
image: plugins/docker:17.12
300+
image: plugins/docker:18.09
301301
pull: true
302302
repo: gitea/gitea
303303
cache_from: gitea/gitea
@@ -306,7 +306,7 @@ pipeline:
306306
event: [ pull_request ]
307307

308308
release-docker:
309-
image: plugins/docker:17.12
309+
image: plugins/docker:18.09
310310
pull: true
311311
secrets: [ docker_username, docker_password ]
312312
repo: gitea/gitea
@@ -317,7 +317,7 @@ pipeline:
317317
branch: [ release/* ]
318318

319319
docker:
320-
image: plugins/docker:17.12
320+
image: plugins/docker:18.09
321321
secrets: [ docker_username, docker_password ]
322322
pull: true
323323
repo: gitea/gitea

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
###################################
33
#Build stage
4-
FROM golang:1.12-alpine3.9 AS build-env
4+
FROM golang:1.12-alpine3.10 AS build-env
55

66
#Build deps
77
RUN apk --no-cache add build-base git
@@ -19,7 +19,7 @@ WORKDIR ${GOPATH}/src/code.gitea.io/gitea
1919
RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
2020
&& make GITEA_VERSION="${VERSION}" clean generate build
2121

22-
FROM alpine:3.9
22+
FROM alpine:3.10
2323
LABEL maintainer="[email protected]"
2424

2525
RUN set -s && \

0 commit comments

Comments
 (0)