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

Merge branch 'fix/53-update-docker-build-command-in-deploy-scripts' into 'develop' 

Resolve "Update docker build command in deploy scripts"

See merge request !159
parents 3d2441a8 8a56d40b

deploy/tfs.sh

+23 −7
Original line number Diff line number Diff line
@@ -183,6 +183,22 @@ REDIS_PASSWORD=`uuidgen` 
kubectl create secret generic redis-secrets --namespace=$TFS_K8S_NAMESPACE \

    --from-literal=REDIS_PASSWORD=$REDIS_PASSWORD

echo "export REDIS_PASSWORD=${REDIS_PASSWORD}" >> $ENV_VARS_SCRIPT

printf "\n"



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 $TFS_COMPONENTS; do

    echo "Processing '$COMPONENT' component..."
@@ -192,24 +208,24 @@ for COMPONENT in $TFS_COMPONENTS; do 
        BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}.log"



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

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

            $DOCKER_BUILD -t "$COMPONENT:$TFS_IMAGE_TAG" -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

            IMAGE_NAME="$COMPONENT-backend:$TFS_IMAGE_TAG-builder"

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

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

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

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

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

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



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

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

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

        else

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

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

        fi



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

src/compute/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ FROM python:3.9-slim 


# Install dependencies

RUN apt-get --yes --quiet --quiet update && \

    apt-get --yes --quiet --quiet install wget g++ && \

    apt-get --yes --quiet --quiet install wget g++ git && \

    rm -rf /var/lib/apt/lists/*



# Set Python to show logs as they occur
@@ -53,7 +53,7 @@ RUN python3 -m grpc_tools.protoc -I=. --python_out=. --grpc_python_out=. *.proto 
RUN rm *.proto

RUN find . -type f -exec sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' {} \;



# Create component sub-folder, get specific Python packages

# Create component sub-folders, get specific Python packages

RUN mkdir -p /var/teraflow/compute

WORKDIR /var/teraflow/compute

COPY src/compute/requirements.in requirements.in

src/context/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ FROM python:3.9-slim 


# Install dependencies

RUN apt-get --yes --quiet --quiet update && \

    apt-get --yes --quiet --quiet install wget g++ && \

    apt-get --yes --quiet --quiet install wget g++ git && \

    rm -rf /var/lib/apt/lists/*



# Set Python to show logs as they occur
@@ -53,7 +53,7 @@ RUN python3 -m grpc_tools.protoc -I=. --python_out=. --grpc_python_out=. *.proto 
RUN rm *.proto

RUN find . -type f -exec sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' {} \;



# Create component sub-folder, get specific Python packages

# Create component sub-folders, get specific Python packages

RUN mkdir -p /var/teraflow/context

WORKDIR /var/teraflow/context

COPY src/context/requirements.in requirements.in

src/dbscanserving/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ FROM python:3.9-slim 


# Install dependencies

RUN apt-get --yes --quiet --quiet update && \

    apt-get --yes --quiet --quiet install wget g++ && \

    apt-get --yes --quiet --quiet install wget g++ git && \

    rm -rf /var/lib/apt/lists/*



# Set Python to show logs as they occur

src/dlt/connector/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ FROM python:3.9-slim 


# Install dependencies

RUN apt-get --yes --quiet --quiet update && \

    apt-get --yes --quiet --quiet install wget g++ && \

    apt-get --yes --quiet --quiet install wget g++ git && \

    rm -rf /var/lib/apt/lists/*



# Set Python to show logs as they occur