Commit 21156685 authored by Sergio Gimenez's avatar Sergio Gimenez
Browse files

chore: use public TF SDK sources

parent 1d05bd0a

Dockerfile

+1 −2
Original line number Diff line number Diff line
@@ -34,9 +34,8 @@ RUN apt-get update && apt-get install -y \ 
  && rm -rf /var/lib/apt/lists/*

# Copy application code

COPY . . 

ARG PIP_INDEX_URL

# Install Python dependencies

RUN python -m pip install --no-cache-dir -r requirements.txt --trusted-host gitlab.i2cat.net --extra-index-url ${PIP_INDEX_URL}

RUN python -m pip install --no-cache-dir -r requirements.txt

WORKDIR /usr/app/src/

EXPOSE 8989

# Set Gunicorn as the entrypoint

Dockerfile.dev

+1 −3
Original line number Diff line number Diff line
@@ -39,14 +39,12 @@ COPY ../tf-sdk /tmp/tf-sdk 
# Copy application code

COPY . . 



ARG PIP_INDEX_URL

ARG PIP_EXTRA_INDEX_URL



# Install local TF-SDK instead of the published version

RUN pip install --no-cache-dir /tmp/tf-sdk



# Install remaining Python dependencies (TF-SDK will be skipped since already installed)

RUN python -m pip install --no-cache-dir -r requirements.txt --trusted-host gitlab.i2cat.net --extra-index-url ${PIP_EXTRA_INDEX_URL}

RUN python -m pip install --no-cache-dir -r requirements.txt



# Clean up

RUN rm -rf /tmp/tf-sdk

requirements.txt

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ referencing==0.32.0 
requests==2.32.4

rpds-py==0.13.2

six==1.16.0

sunrise6g-opensdk==1.0.29

sunrise6g-opensdk==1.0.10

swagger-ui-bundle==0.0.9

urllib3==2.1.0

Werkzeug==2.2.3

src/test/local-deployment/docker-compose.yml

+0 −8
Original line number Diff line number Diff line
@@ -63,9 +63,6 @@ services: 
    build:

      context: ../../../

      dockerfile: Dockerfile

      args:

        PIP_INDEX_URL: https://gitlab-ci-token:glpat-Gm4adH6E5xJGt51zZDEs@gitlab.i2cat.net/api/v4/projects/2512/packages/pypi/simple

        PIP_EXTRA_INDEX_URL: https://gitlab-ci-token:glpat-Gm4adH6E5xJGt51zZDEs@gitlab.i2cat.net/api/v4/projects/2514/packages/pypi/simple

    container_name: federation-manager-remote

    restart: unless-stopped

    ports:
@@ -74,7 +71,6 @@ services: 
      - ../../conf/config-fm-remote.cfg:/usr/app/src/conf/config.cfg

      - ../../clients/tf_sdk.py:/usr/app/src/clients/tf_sdk.py

      - /home/sergio/i2cat/OperatorPlatform/OP_Automation/automation/op1/op1-kubeconfig.yaml:/root/.kube/config

      - ../../../../tf-sdk/src/sunrise6g_opensdk:/usr/local/lib/python3.12/site-packages/sunrise6g_opensdk



    depends_on:

      - mongodb-remote
@@ -86,9 +82,6 @@ services: 
    build:

      context: ../../../

      dockerfile: Dockerfile

      args:

        PIP_INDEX_URL: https://gitlab-ci-token:glpat-Gm4adH6E5xJGt51zZDEs@gitlab.i2cat.net/api/v4/projects/2512/packages/pypi/simple

        PIP_EXTRA_INDEX_URL: https://gitlab-ci-token:glpat-Gm4adH6E5xJGt51zZDEs@gitlab.i2cat.net/api/v4/projects/2514/packages/pypi/simple

    container_name: federation-manager-local

    restart: unless-stopped

    ports:
@@ -99,7 +92,6 @@ services: 
      - ../../conf/config-fm-local.cfg:/usr/app/src/conf/config.cfg

      - ../../clients/tf_sdk.py:/usr/app/src/clients/tf_sdk.py

      - /home/sergio/i2cat/OperatorPlatform/OP_Automation/automation/op1/op1-kubeconfig.yaml:/root/.kube/config

      - ../../../../tf-sdk/src/sunrise6g_opensdk:/usr/local/lib/python3.12/site-packages/sunrise6g_opensdk

    depends_on:

      - mongodb-local

      - keycloak-local