Skip to content

Alpine 3.10 #7256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 20, 2019
Merged

Alpine 3.10 #7256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
91dbced
Update to alpine 3.10
techknowlogick Jun 19, 2019
5a769eb
Update dockerfile
techknowlogick Jun 19, 2019
0052e49
update drone
techknowlogick Jun 19, 2019
9b561a7
Merge branch 'master' into alpine-3.10
lunny Jun 20, 2019
57c95d5
Update Dockerfile
techknowlogick Jun 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .drone.yml
View file
Open in desktop
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
View file
Open in desktop
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="[email protected]"

EXPOSE 22 3000
Expand Down