Merge branch 'develop' into gun

[akkoma] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25e002980493d2d0834330544d363df9335c386c..5d0d3316a23871d69eedf83b0f8c50eb2e82b28a 100644 (file)
--- 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
@@ -294,8 +294,6 @@ docker:
     - dind
   only:
     - develop@pleroma/pleroma
-    - /^maint/.*$/@pleroma/pleroma
-    - /^ci\/.*$/@jp/pleroma
 
 docker-stable:
   stage: docker
@@ -306,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
@@ -315,4 +312,20 @@ 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