Browse Source

Alpine 3.12 (#11720)

* increase alpine to 3.12

* Update .drone.yml
tags/v1.13.0-rc1
techknowlogick GitHub 5 years ago
parent
commit
b4b39525ef
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      .drone.yml
  2. +2
    -2
      Dockerfile

+ 2
- 2
.drone.yml View File

@@ -160,7 +160,7 @@ steps:


- name: tag-pre-condition - name: tag-pre-condition
pull: always pull: always
image: alpine/git
image: drone/git
commands: commands:
- git update-ref refs/heads/tag_test ${DRONE_COMMIT_SHA} - git update-ref refs/heads/tag_test ${DRONE_COMMIT_SHA}


@@ -366,7 +366,7 @@ steps:


- name: update - name: update
pull: default pull: default
image: alpine:3.11
image: alpine:3.12
commands: commands:
- ./build/update-locales.sh - ./build/update-locales.sh




+ 2
- 2
Dockerfile View File

@@ -1,7 +1,7 @@


################################### ###################################
#Build stage #Build stage
FROM golang:1.14-alpine3.11 AS build-env
FROM golang:1.14-alpine3.12 AS build-env


ARG GOPROXY ARG GOPROXY
ENV GOPROXY ${GOPROXY:-direct} ENV GOPROXY ${GOPROXY:-direct}
@@ -21,7 +21,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-all build && make clean-all build


FROM alpine:3.11
FROM alpine:3.12
LABEL maintainer="maintainers@gitea.io" LABEL maintainer="maintainers@gitea.io"


EXPOSE 22 3000 EXPOSE 22 3000


Loading…
Cancel
Save