From 8db4541ecf626f43449d89f15a65ac530509d205 Mon Sep 17 00:00:00 2001
From: techknowlogick <hello@techknowlogick.com>
Date: Thu, 20 Jun 2019 19:47:51 -0400
Subject: [PATCH] Alpine 3.10 (#7256)

---
 .drone.yml | 10 +++++-----
 Dockerfile |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index df972ee0b..fca798d28 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -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
@@ -163,7 +163,7 @@ pipeline:
       event: [ tag ]
 
   test-mysql8:
-    image: golang:1.11
+    image: golang:1.12
     pull: true
     group: test
     environment:
@@ -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
@@ -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
@@ -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
diff --git a/Dockerfile b/Dockerfile
index 1aae5fc6d..f13fdbe55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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"
@@ -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