Commit d4fffceb authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Refactor CI/CD scripts to source image tags from a shared script for consistency

parent 241bc3bc

src/policy/.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ build policy: 
    - bash scripts/dockerhub_login.sh

    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

  script:

    - export POL_IMAGE_TAG=$(grep -m1 '<version>' ./src/$IMAGE_NAME_POLICY/pom.xml | grep -oP  '(?<=>).*(?=<)')

    - source scripts/ci_image_tags.sh

    - export POL_IMAGE_TAG="${CI_IMAGE_TAG}"

    - echo "POL_IMAGE_TAG=${POL_IMAGE_TAG}" >> ${BUILD_ENV_POLICY}

    - cat ${BUILD_ENV_POLICY}

    - docker buildx build -t "$IMAGE_NAME_POLICY:$POL_IMAGE_TAG" -f ./src/$IMAGE_NAME_POLICY/src/main/docker/Dockerfile.multistage.jvm ./src/$IMAGE_NAME_POLICY/ --target builder

src/ztp/.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ build ztp: 
    - bash scripts/dockerhub_login.sh

    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

  script:

    - export ZTP_IMAGE_TAG=$(grep -m1 '<version>' ./src/$IMAGE_NAME/pom.xml | grep -oP  '(?<=>).*(?=<)')

    - source scripts/ci_image_tags.sh

    - export ZTP_IMAGE_TAG="${CI_IMAGE_TAG}"

    - echo "ZTP_IMAGE_TAG=${ZTP_IMAGE_TAG}" >> ${BUILD_ENV}

    - cat ${BUILD_ENV}

    - docker buildx build -t "$IMAGE_NAME:$ZTP_IMAGE_TAG" -f ./src/$IMAGE_NAME/src/main/docker/Dockerfile.multistage.jvm ./src/$IMAGE_NAME/ --target builder