X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=.gitlab-ci.yml;h=5d0d3316a23871d69eedf83b0f8c50eb2e82b28a;hb=6813c0302c2b665d337d5f5831d2df6312b6b277;hp=2b26010826769f86559b778fadab982833058c6f;hpb=77412d5dd24a384f9be7d6bc6b1538415c584802;p=akkoma

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b2601082..5d0d3316a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -281,19 +281,19 @@ 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 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
   tags:
     - dind
   only:
-    - develop
+    - develop@pleroma/pleroma
 
 docker-stable:
   stage: docker
@@ -304,12 +304,28 @@ 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 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
   tags:
     - dind
   only:
-    - stable
+    - 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