From 0d12a3f653077bee6845754bbe754f89fa33fa10 Mon Sep 17 00:00:00 2001
From: Lluis Gifre <lluis.gifre@cttc.es>
Date: Fri, 7 Jan 2022 11:36:06 +0100
Subject: [PATCH] Fixing GitLab CI for Compute
---
manifests/contextservice.yaml | 2 ++
src/compute/.gitlab-ci.yml | 4 ++--
src/context/.gitlab-ci.yml | 4 ++--
src/device/.gitlab-ci.yml | 4 ++--
src/service/.gitlab-ci.yml | 4 ++--
5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/manifests/contextservice.yaml b/manifests/contextservice.yaml
index 6c72da1dd..7ccf3e4f0 100644
--- a/manifests/contextservice.yaml
+++ b/manifests/contextservice.yaml
@@ -34,6 +34,8 @@ spec:
env:
- name: DB_BACKEND
value: "redis"
+ - name: MB_BACKEND
+ value: "redis"
- name: REDIS_DATABASE_ID
value: "0"
- name: LOG_LEVEL
diff --git a/src/compute/.gitlab-ci.yml b/src/compute/.gitlab-ci.yml
index cc0ca4213..d10d5acfb 100644
--- a/src/compute/.gitlab-ci.yml
+++ b/src/compute/.gitlab-ci.yml
@@ -10,8 +10,8 @@ build compute:
- docker build -t "$IMAGE_NAME:$IMAGE_TAG" -f ./src/$IMAGE_NAME/Dockerfile ./src/
- 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 rmi $(docker images --quiet --filter=dangling=true)
+ after_script:
+ - docker images --filter="dangling=true" --quiet | xargs -r docker rmi
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"'
diff --git a/src/context/.gitlab-ci.yml b/src/context/.gitlab-ci.yml
index 9fbad71bc..bae78b86d 100644
--- a/src/context/.gitlab-ci.yml
+++ b/src/context/.gitlab-ci.yml
@@ -10,8 +10,8 @@ build context:
- docker build -t "$IMAGE_NAME:$IMAGE_TAG" -f ./src/$IMAGE_NAME/Dockerfile ./src/
- 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 rmi $(docker images --quiet --filter=dangling=true)
+ after_script:
+ - docker images --filter="dangling=true" --quiet | xargs -r docker rmi
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"'
diff --git a/src/device/.gitlab-ci.yml b/src/device/.gitlab-ci.yml
index 5868c6884..2c93618af 100644
--- a/src/device/.gitlab-ci.yml
+++ b/src/device/.gitlab-ci.yml
@@ -10,8 +10,8 @@ build device:
- docker build -t "$IMAGE_NAME:$IMAGE_TAG" -f ./src/$IMAGE_NAME/Dockerfile ./src/
- 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 rmi $(docker images --quiet --filter=dangling=true)
+ after_script:
+ - docker images --filter="dangling=true" --quiet | xargs -r docker rmi
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"'
diff --git a/src/service/.gitlab-ci.yml b/src/service/.gitlab-ci.yml
index d47177171..3c943d543 100644
--- a/src/service/.gitlab-ci.yml
+++ b/src/service/.gitlab-ci.yml
@@ -10,8 +10,8 @@ build service:
- docker build -t "$IMAGE_NAME:$IMAGE_TAG" -f ./src/$IMAGE_NAME/Dockerfile ./src/
- 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 rmi $(docker images --quiet --filter=dangling=true)
+ after_script:
+ - docker images --filter="dangling=true" --quiet | xargs -r docker rmi
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"'
--
GitLab