Commit 34ba6c67 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Device, PathComp Frontend, Service, Slice components: 

- Corrected dependencies in Dockerfiles
parent d89126d4

src/device/Dockerfile

+4 −2
Original line number Diff line number Diff line
@@ -62,9 +62,11 @@ RUN python3 -m pip install -r requirements.txt 


# Add component files into working directory

WORKDIR /var/teraflow

COPY src/context/. context/

COPY src/context/__init__.py context/__init__.py

COPY src/context/client/. context/client/

COPY src/monitoring/__init__.py monitoring/__init__.py

COPY src/monitoring/client/. monitoring/client/

COPY src/device/. device/

COPY src/monitoring/. monitoring/



RUN mkdir -p tests/tools/mock_ietf_actn_sdn_ctrl

RUN touch tests/__init__.py

src/pathcomp/frontend/Dockerfile

+6 −4
Original line number Diff line number Diff line
@@ -54,26 +54,28 @@ RUN rm *.proto 
RUN find . -type f -exec sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' {} \;



# Create component sub-folders, get specific Python packages

RUN mkdir -p /var/teraflow/pathcomp

WORKDIR /var/teraflow/pathcomp

RUN mkdir -p /var/teraflow/pathcomp/frontend

WORKDIR /var/teraflow/pathcomp/frontend

COPY src/pathcomp/frontend/requirements.in requirements.in

RUN pip-compile --quiet --output-file=requirements.txt requirements.in

RUN python3 -m pip install -r requirements.txt



# Add component files into working directory

WORKDIR /var/teraflow

COPY src/pathcomp/__init__.py pathcomp/__init__.py

COPY src/pathcomp/frontend/. pathcomp/frontend/

COPY src/context/__init__.py context/__init__.py

COPY src/context/client/. context/client/

COPY src/device/__init__.py device/__init__.py

COPY src/device/client/. device/client/

COPY src/forecaster/. forecaster/

COPY src/forecaster/__init__.py forecaster/__init__.py

COPY src/forecaster/client/. forecaster/client/

COPY src/monitoring/__init__.py monitoring/__init__.py

COPY src/monitoring/client/. monitoring/client/

COPY src/service/__init__.py service/__init__.py

COPY src/service/client/. service/client/

COPY src/slice/__init__.py slice/__init__.py

COPY src/slice/client/. slice/client/

COPY src/pathcomp/. pathcomp/



# Start the service

ENTRYPOINT ["python", "-m", "pathcomp.frontend.service"]

src/service/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ RUN python3 -m pip install -r requirements.txt 


# Add component files into working directory

WORKDIR /var/teraflow

COPY src/service/. service/

COPY src/context/__init__.py context/__init__.py

COPY src/context/client/. context/client/

COPY src/device/__init__.py device/__init__.py
@@ -71,6 +70,7 @@ COPY src/pathcomp/frontend/__init__.py pathcomp/frontend/__init__.py 
COPY src/pathcomp/frontend/client/. pathcomp/frontend/client/

COPY src/e2e_orchestrator/__init__.py e2e_orchestrator/__init__.py

COPY src/e2e_orchestrator/client/. e2e_orchestrator/client/

COPY src/service/. service/



# Start the service

ENTRYPOINT ["python", "-m", "service.service"]

src/slice/Dockerfile

+9 −4
Original line number Diff line number Diff line
@@ -62,10 +62,15 @@ RUN python3 -m pip install -r requirements.txt 


# Add component files into working directory

WORKDIR /var/teraflow

COPY src/context/. context/

COPY src/interdomain/. interdomain/

COPY src/pathcomp/. pathcomp/

COPY src/service/. service/

COPY src/context/__init__.py context/__init__.py

COPY src/context/client/. context/client/

COPY src/interdomain/__init__.py interdomain/__init__.py

COPY src/interdomain/client/. interdomain/client/

COPY src/pathcomp/__init__.py pathcomp/__init__.py

COPY src/pathcomp/frontend/__init__.py pathcomp/frontend/__init__.py

COPY src/pathcomp/frontend/client/. pathcomp/frontend/client/

COPY src/service/__init__.py service/__init__.py

COPY src/service/client/. service/client/

COPY src/slice/. slice/



# Start the service