Commit 785f2570 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/319-cttc-fix-docker-image-cleanup-in-ci-cd-pipeline' into 'develop' 

Resolve "(CTTC) Fix Docker image cleanup in CI/CD pipeline"

See merge request !381
parents 3d96577d ba2ecfb9

scripts/run_tests_locally-nbi-all.sh

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ docker container prune -f 
docker pull "bitnami/kafka:latest"

docker buildx build -t "mock_tfs_nbi_dependencies:test" -f ./src/tests/tools/mock_tfs_nbi_dependencies/Dockerfile .

docker buildx build -t "nbi:latest" -f ./src/nbi/Dockerfile .

docker images --filter="dangling=true" --quiet | xargs -r docker rmi

docker image prune --force



docker network create -d bridge teraflowbridge

scripts/run_tests_locally-optical-attack-detector.sh

+2 −2
Original line number Diff line number Diff line
@@ -37,13 +37,13 @@ echo 
echo "Build optical attack detector:"

echo "------------------------------"

docker build -t "opticalattackdetector:latest" -f ./src/opticalattackdetector/Dockerfile .

docker images --filter="dangling=true" --quiet | xargs -r docker rmi

docker image prune --force



echo

echo "Build dbscan serving:"

echo "---------------------"

docker build -t "dbscanserving:latest" -f ./src/dbscanserving/Dockerfile .

docker images --filter="dangling=true" --quiet | xargs -r docker rmi

docker image prune --force



echo

echo "Create test environment:"

src/analytics/.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ build analytics: 
    IMAGE_TAG: 'latest'             # tag of the container image (production, development, etc)

  stage: build

  before_script:

    - docker image prune --force

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

  script:

    # This first build tags the builder resulting image to prevent being removed by dangling image removal command
@@ -30,7 +31,7 @@ build analytics: 
    - docker push "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-frontend:$IMAGE_TAG"

    - docker push "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-backend:$IMAGE_TAG"

  after_script:

    - docker images --filter="dangling=true" --quiet | xargs -r docker rmi

    - docker image prune --force

  rules:

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'

    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"'

src/automation/.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line
@@ -19,13 +19,14 @@ build automation: 
    IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)

  stage: build

  before_script:

    - docker image prune --force

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

  script:

    - docker buildx build -t "$IMAGE_NAME:$IMAGE_TAG" -f ./src/$IMAGE_NAME/Dockerfile .

    - docker tag "$IMAGE_NAME:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

    - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

  after_script:

    - docker images --filter="dangling=true" --quiet | xargs -r docker rmi

    - docker image prune --force

  rules:

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'

    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"'

src/bgpls_speaker/.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line
@@ -19,13 +19,14 @@ build bgpls_speaker: 
    IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)

  stage: build

  before_script:

    - docker image prune --force

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

  script:

    - docker buildx build -t "$IMAGE_NAME:$IMAGE_TAG" -f ./src/$IMAGE_NAME/Dockerfile .

    - docker tag "$IMAGE_NAME:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

    - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

  after_script:

    - docker images --filter="dangling=true" --quiet | xargs -r docker rmi

    - docker image prune --force

  rules:

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'

    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"'