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

GitLab CI/CD pipeline & reorganization: 

- Updated build commands to docker buildx
- Removed unneeded scripts
- Moved scripts to scripts folder
parent 5128fd5f

deploy/component.sh

+20 −5
Original line number Diff line number Diff line
@@ -40,6 +40,21 @@ export TFS_GRAFANA_PASSWORD=${TFS_GRAFANA_PASSWORD:-"admin123+"} 
# Automated steps start here

########################################################################################################################



DOCKER_BUILD="docker build"

DOCKER_MAJOR_VERSION=$(docker --version | grep -o -E "Docker version [0-9]+\." | grep -o -E "[0-9]+" | cut -c 1-3)

if [[ $DOCKER_MAJOR_VERSION -ge 23 ]]; then

    # If Docker version >= 23, build command was migrated to docker-buildx

    # In Ubuntu, in practice, means to install package docker-buildx together with docker.io

    # Check if docker-buildx plugin is installed

    docker buildx version 1>/dev/null 2>/dev/null

    if [[ $? -ne 0 ]]; then

        echo "Docker buildx command is not installed. Check: https://docs.docker.com/build/architecture/#install-buildx"

        echo "If you installed docker through APT package docker.io, consider installing also package docker-buildx"

        exit 1;

    fi

    DOCKER_BUILD="docker buildx build"

fi



# Constants

GITLAB_REPO_URL="labs.etsi.org:5050/tfs/controller"

TMP_FOLDER="./tmp"
@@ -60,17 +75,17 @@ for COMPONENT in $TFS_COMPONENTS; do 
    BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}.log"



    if [ "$COMPONENT" == "ztp" ] || [ "$COMPONENT" == "policy" ]; then

        docker build -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile ./src/"$COMPONENT"/ > "$BUILD_LOG"

        $DOCKER_BUILD -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile ./src/"$COMPONENT"/ > "$BUILD_LOG"

    elif [ "$COMPONENT" == "pathcomp" ]; then

        BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}-frontend.log"

        docker build -t "$COMPONENT-frontend:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/frontend/Dockerfile . >> "$BUILD_LOG"

        $DOCKER_BUILD -t "$COMPONENT-frontend:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/frontend/Dockerfile . >> "$BUILD_LOG"



        BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}-backend.log"

        docker build -t "$COMPONENT-backend:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/backend/Dockerfile . >> "$BUILD_LOG"

        $DOCKER_BUILD -t "$COMPONENT-backend:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/backend/Dockerfile . >> "$BUILD_LOG"

        # next command is redundant, but helpful to keep cache updated between rebuilds

        docker build -t "$COMPONENT-backend:$TFS_IMAGE_TAG-builder" --target builder -f ./src/"$COMPONENT"/backend/Dockerfile . >> "$BUILD_LOG"

        $DOCKER_BUILD -t "$COMPONENT-backend:$TFS_IMAGE_TAG-builder" --target builder -f ./src/"$COMPONENT"/backend/Dockerfile . >> "$BUILD_LOG"

    else

        docker build -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile . > "$BUILD_LOG"

        $DOCKER_BUILD -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile . > "$BUILD_LOG"

    fi



    if [ -n "$TFS_REGISTRY_IMAGES" ]; then

deploy/mock_blockchain.sh

+16 −1
Original line number Diff line number Diff line
@@ -58,9 +58,24 @@ echo "Processing '$COMPONENT' component..." 
IMAGE_NAME="$COMPONENT:$IMAGE_TAG"

IMAGE_URL=$(echo "$REGISTRY_IMAGE/$IMAGE_NAME" | sed 's,//,/,g' | sed 's,http:/,,g')



DOCKER_BUILD="docker build"

DOCKER_MAJOR_VERSION=$(docker --version | grep -o -E "Docker version [0-9]+\." | grep -o -E "[0-9]+" | cut -c 1-3)

if [[ $DOCKER_MAJOR_VERSION -ge 23 ]]; then

    # If Docker version >= 23, build command was migrated to docker-buildx

    # In Ubuntu, in practice, means to install package docker-buildx together with docker.io

    # Check if docker-buildx plugin is installed

    docker buildx version 1>/dev/null 2>/dev/null

    if [[ $? -ne 0 ]]; then

        echo "Docker buildx command is not installed. Check: https://docs.docker.com/build/architecture/#install-buildx"

        echo "If you installed docker through APT package docker.io, consider installing also package docker-buildx"

        exit 1;

    fi

    DOCKER_BUILD="docker buildx build"

fi



echo "  Building Docker image..."

BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}.log"

docker build -t "$IMAGE_NAME" -f ./src/dlt/mock_blockchain/Dockerfile . > "$BUILD_LOG"

$DOCKER_BUILD -t "$IMAGE_NAME" -f ./src/dlt/mock_blockchain/Dockerfile . > "$BUILD_LOG"



if [ -n "$REGISTRY_IMAGE" ]; then

    echo "  Pushing Docker image to '$REGISTRY_IMAGE'..."

run_tests_docker.sh→scripts/run_tests_docker.sh

+17 −2
Original line number Diff line number Diff line
@@ -35,6 +35,21 @@ TMP_FOLDER="./tmp" 
TMP_LOGS_FOLDER="$TMP_FOLDER/logs"

mkdir -p $TMP_LOGS_FOLDER



DOCKER_BUILD="docker build"

DOCKER_MAJOR_VERSION=$(docker --version | grep -o -E "Docker version [0-9]+\." | grep -o -E "[0-9]+" | cut -c 1-3)

if [[ $DOCKER_MAJOR_VERSION -ge 23 ]]; then

    # If Docker version >= 23, build command was migrated to docker-buildx

    # In Ubuntu, in practice, means to install package docker-buildx together with docker.io

    # Check if docker-buildx plugin is installed

    docker buildx version 1>/dev/null 2>/dev/null

    if [[ $? -ne 0 ]]; then

        echo "Docker buildx command is not installed. Check: https://docs.docker.com/build/architecture/#install-buildx"

        echo "If you installed docker through APT package docker.io, consider installing also package docker-buildx"

        exit 1;

    fi

    DOCKER_BUILD="docker buildx build"

fi



for COMPONENT in $COMPONENTS; do

    echo "Processing '$COMPONENT' component..."

    IMAGE_NAME="$COMPONENT:$IMAGE_TAG"
@@ -44,9 +59,9 @@ for COMPONENT in $COMPONENTS; do 
    BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}.log"



    if [ "$COMPONENT" == "ztp" ] || [ "$COMPONENT" == "policy" ]; then

        docker build -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile ./src/"$COMPONENT"/ > "$BUILD_LOG"

        $DOCKER_BUILD -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile ./src/"$COMPONENT"/ > "$BUILD_LOG"

    else 

        docker build -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile ./src/ > "$BUILD_LOG"

        $DOCKER_BUILD -t "$IMAGE_NAME" -f ./src/"$COMPONENT"/Dockerfile ./src/ > "$BUILD_LOG"

    fi



    if [ -n "$REGISTRY_IMAGE" ]; then