From cc4c3255fe052b69e1f0115bfd5d2936c669a385 Mon Sep 17 00:00:00 2001
From: jp <jp+pleroma@supplntr.io>
Date: Wed, 15 Jan 2020 16:16:29 -0500
Subject: [PATCH 1/5] Fix odd spacing

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b2601082..3dff6237a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -286,7 +286,7 @@ docker:
   allow_failure: true
   script:
     - docker pull $IMAGE_TAG_SLUG || true
-    - 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 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
@@ -305,7 +305,7 @@ docker-stable:
   allow_failure: true
   script:
     - docker pull $IMAGE_TAG_SLUG || true
-    - 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 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

From 4d19f38753353ab804406bc8a8c11fc57de74c66 Mon Sep 17 00:00:00 2001
From: jp <jp+pleroma@supplntr.io>
Date: Wed, 15 Jan 2020 16:23:43 -0500
Subject: [PATCH 2/5] update `only:` for release/ branch regex matching. and to
 avoid running image builds on unnecessary forks

---
 .gitlab-ci.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3dff6237a..25e002980 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -293,7 +293,9 @@ docker:
   tags:
     - dind
   only:
-    - develop
+    - develop@pleroma/pleroma
+    - /^maint/.*$/@pleroma/pleroma
+    - /^ci\/.*$/@jp/pleroma
 
 docker-stable:
   stage: docker
@@ -312,4 +314,5 @@ docker-stable:
   tags:
     - dind
   only:
-    - stable
+    - stable@pleroma/pleroma
+    - /^release/.*$/@pleroma/pleroma

From 0c9499bf25ba096c7491074b4ad4c5a516303f40 Mon Sep 17 00:00:00 2001
From: jp <jp+pleroma@supplntr.io>
Date: Wed, 15 Jan 2020 16:41:41 -0500
Subject: [PATCH 3/5] Fix only: on docker develop/latest job

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25e002980..44477ea99 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -294,8 +294,6 @@ docker:
     - dind
   only:
     - develop@pleroma/pleroma
-    - /^maint/.*$/@pleroma/pleroma
-    - /^ci\/.*$/@jp/pleroma
 
 docker-stable:
   stage: docker

From ffab411327cff96e547038f694b3d7d30f45e521 Mon Sep 17 00:00:00 2001
From: jp <jp+pleroma@supplntr.io>
Date: Wed, 15 Jan 2020 16:54:53 -0500
Subject: [PATCH 4/5] Update docker jobs for release branches and stable
 branches

---
 .gitlab-ci.yml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 44477ea99..318dca87e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -281,11 +281,11 @@ docker:
     IMAGE_TAG_LATEST_STABLE: $CI_REGISTRY_IMAGE:latest-stable
   before_script: &before-docker
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker pull $IMAGE_TAG_SLUG || true
     - export CI_JOB_TIMESTAMP=$(date --utc -Iseconds)
     - export CI_VCS_REF=$CI_COMMIT_SHORT_SHA
   allow_failure: true
   script:
-    - docker pull $IMAGE_TAG_SLUG || true
     - 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
@@ -304,7 +304,6 @@ docker-stable:
   before_script: *before-docker
   allow_failure: true
   script:
-    - docker pull $IMAGE_TAG_SLUG || true
     - 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
@@ -313,4 +312,21 @@ docker-stable:
     - dind
   only:
     - stable@pleroma/pleroma
+
+docker-release:
+  stage: docker
+  image: docker:latest
+  cache: {}
+  dependencies: []
+  variables: *docker-variables
+  before_script: *before-docker
+  allow_failure: true
+  script:
+    - 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:
+    - dind
+  only:
     - /^release/.*$/@pleroma/pleroma
+    - /^ci\/.*$/@jp/pleroma

From 1e17ad2275d102bd7e3a255989f22cfbbd065ada Mon Sep 17 00:00:00 2001
From: jp <jp+pleroma@supplntr.io>
Date: Wed, 15 Jan 2020 17:25:33 -0500
Subject: [PATCH 5/5] Update docker release / stable jobs

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 318dca87e..5d0d3316a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -329,4 +329,3 @@ docker-release:
     - dind
   only:
     - /^release/.*$/@pleroma/pleroma
-    - /^ci\/.*$/@jp/pleroma