From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Wed, 1 Apr 2020 03:44:47 +0000 (+0000)
Subject: Merge branch 'ops/fix-ci' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c9f51edea12599cd0384b0f23d5aba8465c6a865;hp=ec5d6eef6a956d4ed3ab30b154a69bf5fc59ec50;p=akkoma

Merge branch 'ops/fix-ci' into 'develop'

Ops/fix ci

See merge request pleroma/pleroma!2340
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e4bd8d282..1b7c03ebb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -288,7 +288,7 @@ docker:
     - export CI_VCS_REF=$CI_COMMIT_SHORT_SHA
   allow_failure: true
   script:
-    - docker build --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t $IMAGE_TAG_SLUG -t $IMAGE_TAG_LATEST .
+    - docker build --cache-from $IMAGE_TAG_SLUG --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t $IMAGE_TAG_SLUG -t $IMAGE_TAG_LATEST .
     - docker push $IMAGE_TAG
     - docker push $IMAGE_TAG_SLUG
     - docker push $IMAGE_TAG_LATEST
@@ -306,7 +306,7 @@ docker-stable:
   before_script: *before-docker
   allow_failure: true
   script:
-    - docker build --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t $IMAGE_TAG_SLUG -t $IMAGE_TAG_LATEST_STABLE .
+    - docker build --cache-from $IMAGE_TAG_SLUG --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t $IMAGE_TAG_SLUG -t $IMAGE_TAG_LATEST_STABLE .
     - docker push $IMAGE_TAG
     - docker push $IMAGE_TAG_SLUG
     - docker push $IMAGE_TAG_LATEST_STABLE
@@ -324,7 +324,7 @@ docker-release:
   before_script: *before-docker
   allow_failure: true
   script:
-    - docker build --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t       $IMAGE_TAG_SLUG .
+    - docker build --cache-from $IMAGE_TAG_SLUG --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t       $IMAGE_TAG_SLUG .
     - docker push $IMAGE_TAG
     - docker push $IMAGE_TAG_SLUG
   tags:
diff --git a/Dockerfile b/Dockerfile
index b21f86fcd..29931a5e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ RUN apk add git gcc g++ musl-dev make &&\
 	mkdir release &&\
 	mix release --path release
 
-FROM alpine:3.9
+FROM alpine:3.11
 
 ARG BUILD_DATE
 ARG VCS_REF