Commit ca485b14 authored by Adriana Fernández-Fernández's avatar Adriana Fernández-Fernández
Browse files

Merge branch 'feature-REL0' into 'main'

Minor fixes to image tags

See merge request !2
parents adef5c8c 2871cc29
Loading
Loading
Loading
Loading
Loading
+14 −14
Original line number Diff line number Diff line
@@ -6,9 +6,7 @@ stages:

variables:
  IMAGE_NAME: federation-manager
  IMAGE_TAG: $CI_COMMIT_SHORT_SHA
  REGISTRY_IMAGE: $CI_REGISTRY_IMAGE/$IMAGE_NAME
  DOCKER_CONFIG: "/kaniko/.docker"

# Build Docker image for merge requests (no push)
build-mr:
@@ -20,15 +18,12 @@ build-mr:
    - echo "Skip pushing for merge requests"
  script:
    - echo "Building image for merge request validation..."
    - /kaniko/executor
        --context "$CI_PROJECT_DIR"
        --dockerfile "$CI_PROJECT_DIR/Dockerfile"
        --no-push
    - /kaniko/executor --context "$CI_PROJECT_DIR" --dockerfile "$CI_PROJECT_DIR/Dockerfile" --no-push
    - echo "Image built successfully for MR validation"
  only:
    - merge_requests

# Build and push Docker image for main branches
# Build and push Docker image for main/develop/tags with specific tagging
build-and-push:
  stage: build
  image:
@@ -37,15 +32,20 @@ build-and-push:
  before_script:
    - mkdir -p /kaniko/.docker
    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
    - |
      if [ "$CI_COMMIT_REF_NAME" = "main" ]; then
        export IMAGE_TAG="latest"
      elif [ "$CI_COMMIT_REF_NAME" = "develop" ]; then
        export IMAGE_TAG="develop"
      elif [ -n "$CI_COMMIT_TAG" ]; then
        export IMAGE_TAG="$CI_COMMIT_TAG"
      else
        export IMAGE_TAG="$CI_COMMIT_REF_NAME"
      fi
      echo "Using image tag: $IMAGE_TAG"
  script:
    - echo "Building image and pushing to registry..."
    - /kaniko/executor
        --context "$CI_PROJECT_DIR"
        --dockerfile "$CI_PROJECT_DIR/Dockerfile"
        --destination "$REGISTRY_IMAGE:$IMAGE_TAG"
        --destination "$REGISTRY_IMAGE:latest"
        --cache=true
        --cache-ttl=24h
    - /kaniko/executor --context "$CI_PROJECT_DIR" --dockerfile "$CI_PROJECT_DIR/Dockerfile" --destination "$REGISTRY_IMAGE:$IMAGE_TAG"
  only:
    - main
    - develop