From 22550a60e9c1e2c5018238844a935f4fbaae2173 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 25 Nov 2021 17:50:57 +0100
Subject: [PATCH] Put latest docker tag directly from CI
Also only do amd64 architecture for tags, not main
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
.gitlab-ci.yml | 48 ++++++++++++++++++++++++++----------------------
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 38f75c481..6d1f7a8c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -190,6 +190,30 @@ pages:
services:
- docker:stable-dind
cache: {}
+ tags:
+ - "privileged"
+
+build-docker-main:
+ <<: *docker
+ rules:
+ - if: '$CI_PROJECT_NAMESPACE != "framasoft"'
+ when: never
+ - if: '$CI_PIPELINE_SOURCE == "schedule"'
+ before_script:
+ # Login to DockerHub
+ - mkdir -p ~/.docker
+ - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$CI_REGISTRY_AUTH\",\"email\":\"$CI_REGISTRY_EMAIL\"}}}" > ~/.docker/config.json
+ script:
+ - docker build -t framasoft/mobilizon:main -f docker/production/Dockerfile .
+ - docker push framasoft/mobilizon:main
+
+build-docker-tag:
+ <<: *docker
+ rules: &tag-rules
+ - if: '$CI_PROJECT_NAMESPACE != "framasoft"'
+ when: never
+ - if: $CI_COMMIT_TAG
+ timeout: 3 hours
before_script:
# Install buildx
- wget https://github.com/docker/buildx/releases/download/v0.6.3/buildx-v0.6.3.linux-amd64
@@ -210,29 +234,9 @@ pages:
docker buildx build
--push
--platform linux/amd64,linux/arm64,linux/arm
- -t $DOCKER_IMAGE_NAME
+ -t framasoft/mobilizon:$CI_COMMIT_TAG
+ -t framasoft/mobilizon:latest
-f docker/production/Dockerfile .
- tags:
- - "privileged"
- timeout: 3 hours
-
-build-docker-main:
- <<: *docker
- rules:
- - if: '$CI_PROJECT_NAMESPACE != "framasoft"'
- when: never
- - if: '$CI_PIPELINE_SOURCE == "schedule"'
- variables:
- DOCKER_IMAGE_NAME: framasoft/mobilizon:main
-
-build-docker-tag:
- <<: *docker
- rules: &tag-rules
- - if: '$CI_PROJECT_NAMESPACE != "framasoft"'
- when: never
- - if: $CI_COMMIT_TAG
- variables:
- DOCKER_IMAGE_NAME: framasoft/mobilizon:$CI_COMMIT_TAG
# Packaging app for amd64
package-app: