Alpine 3.10 (#7256)

release/v1.15
techknowlogick 2019-06-20 19:47:51 -04:00 committed by GitHub
parent de9b398cde
commit 8db4541ecf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View File

@ -24,7 +24,7 @@ pipeline:
branch: [ master ] branch: [ master ]
update-translations: update-translations:
image: alpine:3.7 image: alpine:3.10
commands: commands:
- mv ./options/locale/locale_en-US.ini ./options/ - mv ./options/locale/locale_en-US.ini ./options/
- sed -i -e 's/="/=/g' -e 's/"$$//g' ./options/locale/*.ini - sed -i -e 's/="/=/g' -e 's/"$$//g' ./options/locale/*.ini
@ -163,7 +163,7 @@ pipeline:
event: [ tag ] event: [ tag ]
test-mysql8: test-mysql8:
image: golang:1.11 image: golang:1.12
pull: true pull: true
group: test group: test
environment: environment:
@ -294,7 +294,7 @@ pipeline:
branch: [ master ] branch: [ master ]
docker-dryrun: docker-dryrun:
image: plugins/docker:17.12 image: plugins/docker:18.09
pull: true pull: true
repo: gitea/gitea repo: gitea/gitea
cache_from: gitea/gitea cache_from: gitea/gitea
@ -303,7 +303,7 @@ pipeline:
event: [ pull_request ] event: [ pull_request ]
release-docker: release-docker:
image: plugins/docker:17.12 image: plugins/docker:18.09
pull: true pull: true
secrets: [ docker_username, docker_password ] secrets: [ docker_username, docker_password ]
repo: gitea/gitea repo: gitea/gitea
@ -314,7 +314,7 @@ pipeline:
branch: [ release/* ] branch: [ release/* ]
docker: docker:
image: plugins/docker:17.12 image: plugins/docker:18.09
secrets: [ docker_username, docker_password ] secrets: [ docker_username, docker_password ]
pull: true pull: true
repo: gitea/gitea repo: gitea/gitea

View File

@ -1,7 +1,7 @@
################################### ###################################
#Build stage #Build stage
FROM golang:1.12-alpine3.9 AS build-env FROM golang:1.12-alpine3.10 AS build-env
ARG GITEA_VERSION ARG GITEA_VERSION
ARG TAGS="sqlite sqlite_unlock_notify" ARG TAGS="sqlite sqlite_unlock_notify"
@ -18,7 +18,7 @@ WORKDIR ${GOPATH}/src/code.gitea.io/gitea
RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
&& make clean generate build && make clean generate build
FROM alpine:3.9 FROM alpine:3.10
LABEL maintainer="maintainers@gitea.io" LABEL maintainer="maintainers@gitea.io"
EXPOSE 22 3000 EXPOSE 22 3000