Commit e3338af3 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

intento de arreglo

parent c280f7fe

build_log_speaker.txt

0 → 100644
+1043 −0

File added.

Preview size limit exceeded, changes collapsed.

builder_speak.txt

0 → 100644
+6268 −0

File added.

Preview size limit exceeded, changes collapsed.

src/bgpls_speaker/Dockerfile

+46 −25
Original line number Diff line number Diff line
@@ -13,38 +13,58 @@ 
# limitations under the License.



#

# Download Git repo 

# Maven install stage

#

# FROM alpine/git:latest AS repo

# ----------------------------------------------

FROM alpine/git:latest AS repo



WORKDIR /usr/src/app

RUN git clone https://github.com/telefonicaid/netphony-network-protocols.git .



FROM maven:3.8.8-eclipse-temurin-17 AS build



# RUN mkdir -p /var/teraflow/java_speaker/

# WORKDIR /var/teraflow/java_speaker

# RUN mkdir -p protocols/

# WORKDIR /protocols

# RUN git clone https://github.com/telefonicaid/netphony-network-protocols.git

# COPY ../netphony-network-protocols/src protocols/src

# COPY ../netphony-network-protocols/pom.xml protocols/pom.xml



# RUN mvn dependency:resolve

# RUN mvn clean verify



#

# Maven install stage

#

# ----------------------------------------------

FROM maven:3.6.0-jdk-11-slim AS build

# WORKDIR /var/teraflow/java_speaker/protocols

# RUN mvn clean install

COPY --from=repo /usr/src/app/* /protocols/



WORKDIR /protocols/



# RUN mvn package -X 



# RUN mvn org.apache.maven.plugins:maven-install-plugin:2.5.2:install-file  \

#     -Dfile=/protocols/target/network-protocols-1.1-SNAPSHOT.jar \

#     -DgroupId=es.tid.netphony -DartifactId=network-protocols \

#     -Dversion=1.1-SNAPSHOT-Dpackaging=jar \

#     -DlocalRepositoryPath=/



RUN mkdir -p protocols/

COPY --from=repo /protocols/netphony-network-protocols /protocols/

WORKDIR /protocols

RUN mvn clean install

RUN mvn clean install -X



WORKDIR /

RUN mkdir -p /var/teraflow/bgpls

WORKDIR /var/teraflow/bgpls



RUN mkdir -p /var/teraflow/java_speaker

WORKDIR /var/teraflow/java_speaker



COPY src/bgpls_speaker/service/resources/java/netphony-topology-dev/ src/

COPY src/bgpls_speaker/service/resources/java/netphony-topology-dev/pom.xml pom.xml

COPY src/bgpls_speaker/service/resources/java/netphony-topology-dev/target/generated-sources/ src/target/generated-sources/

# COPY . /var/teraflow/bgpls/



COPY src/bgpls_speaker/service/java/netphony-topology/ /var/teraflow/bgpls/service/java/netphony-topology/

COPY src/bgpls_speaker/service/java/netphony-topology/pom.xml pom.xml



WORKDIR /var/teraflow/bgpls/service/java/netphony-topology/



# RUN mvn package -X -DskipTests -U <--- bgp-ls-speaker-jar-with-dependencies.jar

RUN mvn package -X -DskipTests



# ENTRYPOINT [ "ls","-R" ]

# -------------------------------------------

# jar created in  /netphony-topology-dev/target/bgp-ls-speaker-jar-with-dependencies.jar

# jar created in  /netphony-topology/target/bgp-ls-speaker-jar-with-dependencies.jar



#

# Stage 2
@@ -52,6 +72,7 @@ COPY src/bgpls_speaker/service/resources/java/netphony-topology-dev/target/gener 


FROM python:3.9-slim





# Install dependencies

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

    apt-get --yes --quiet --quiet install wget g++ && \
@@ -72,11 +93,9 @@ RUN python3 -m pip install --upgrade pip-tools 


# Install OpenJDK-11

RUN apt-get update && \

    apt-get install -y openjdk-17-jre-headless && \

    apt-get install -y openjdk-17-jre && \

    apt-get clean;



# COPY --from=build /var/teraflow/java_speaker/target/topology-1.4.0-SNAPSHOT.jar /var/teraflow/java_speaker/



# Get common Python packages

# Note: this step enables sharing the previous Docker build steps among all the Python components

WORKDIR /var/teraflow
@@ -109,6 +128,7 @@ RUN python3 -m pip install -r requirements.txt 
WORKDIR /var/teraflow/bgpls_speaker

RUN mkdir -p /java

COPY src/bgpls_speaker/service/java/* /java/ 

COPY --from=build /var/teraflow/bgpls/service/java/netphony-topology/target/topology-1.4.0-SNAPSHOT.jar /var/teraflow/bgpls_speaker/bgp_ls.jar



# Add component files into working directory

WORKDIR /var/teraflow
@@ -120,3 +140,4 @@ COPY src/bgpls_speaker/. bgpls_speaker/ 


# Start the service

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

# ENTRYPOINT [ "ls","-R" ]
 
 No newline at end of file

src/bgpls_speaker/Dockerfile_mvn

0 → 100644
+149 −0
Original line number Diff line number Diff line 
# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



#

# Maven install stage

#

# ----------------------------------------------

FROM alpine/git:latest AS repo



WORKDIR /usr/src/app

RUN git clone https://github.com/telefonicaid/netphony-network-protocols.git .



FROM eclipse-temurin:17-jdk-focal



RUN apt-get update \

  && apt-get install -y ca-certificates curl git --no-install-recommends \

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



# common for all images

ENV MAVEN_HOME /usr/share/maven



COPY --from=maven:3.8.8-eclipse-temurin-11 ${MAVEN_HOME} ${MAVEN_HOME}

COPY --from=maven:3.8.8-eclipse-temurin-11 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh

COPY --from=maven:3.8.8-eclipse-temurin-11 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml



RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn



ARG MAVEN_VERSION=3.8.8

ARG USER_HOME_DIR="/root"

ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"



COPY --from=repo /usr/src/app/* /protocols/



WORKDIR /protocols/



# RUN mvn package -X 



# RUN mvn org.apache.maven.plugins:maven-install-plugin:2.5.2:install-file  \

#     -Dfile=/protocols/target/network-protocols-1.1-SNAPSHOT.jar \

#     -DgroupId=es.tid.netphony -DartifactId=network-protocols \

#     -Dversion=1.1-SNAPSHOT-Dpackaging=jar \

#     -DlocalRepositoryPath=/



RUN mvn clean install -X



WORKDIR /

RUN mkdir -p /var/teraflow/bgpls

WORKDIR /var/teraflow/bgpls





# COPY . /var/teraflow/bgpls/



COPY src/bgpls_speaker/service/java/netphony-topology/ /var/teraflow/bgpls/service/java/netphony-topology/

COPY src/bgpls_speaker/service/java/netphony-topology/pom.xml pom.xml



WORKDIR /var/teraflow/bgpls/service/java/netphony-topology/



RUN mvn package -X -DskipTests



# ENTRYPOINT [ "ls","-R" ]

# -------------------------------------------

# jar created in  /netphony-topology/target/bgp-ls-speaker-jar-with-dependencies.jar



#

# Stage 2

#



FROM python:3.9-slim





# Install dependencies

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

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

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



# Set Python to show logs as they occur

ENV PYTHONUNBUFFERED=0



# Download the gRPC health probe

RUN GRPC_HEALTH_PROBE_VERSION=v0.2.0 && \

    wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \

    chmod +x /bin/grpc_health_probe



# Get generic Python packages

RUN python3 -m pip install --upgrade pip

RUN python3 -m pip install --upgrade setuptools wheel

RUN python3 -m pip install --upgrade pip-tools



# Install OpenJDK-11

RUN apt-get update && \

    apt-get install -y openjdk-17-jre && \

    apt-get clean;



# Get common Python packages

# Note: this step enables sharing the previous Docker build steps among all the Python components

WORKDIR /var/teraflow

COPY common_requirements.in common_requirements.in

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

RUN python3 -m pip install -r common_requirements.txt



# Add common files into working directory

WORKDIR /var/teraflow/common

COPY src/common/. ./

RUN rm -rf proto



# Create proto sub-folder, copy .proto files, and generate Python code

RUN mkdir -p /var/teraflow/common/proto

WORKDIR /var/teraflow/common/proto

RUN touch __init__.py

COPY proto/*.proto ./

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-folders, get specific Python packages

RUN mkdir -p /var/teraflow/bgpls_speaker

WORKDIR /var/teraflow/bgpls_speaker

COPY src/bgpls_speaker/requirements.in requirements.in

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

RUN python3 -m pip install -r requirements.txt



# Java module necessary config files

WORKDIR /var/teraflow/bgpls_speaker

RUN mkdir -p /java

COPY src/bgpls_speaker/service/java/* /java/ 

COPY --from=build /var/teraflow/bgpls/service/java/netphony-topology/target/topology-1.4.0-SNAPSHOT.jar /var/teraflow/bgpls_speaker/bgp_ls.jar



# Add component files into working directory

WORKDIR /var/teraflow

COPY src/context/. context/

COPY src/device/. device/

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

COPY src/service/. service/

COPY src/bgpls_speaker/. bgpls_speaker/



# Start the service

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

# ENTRYPOINT [ "ls","-R" ]
 
 No newline at end of file

src/bgpls_speaker/quick_deploy.sh

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"} 


# If not already set, set the list of components, separated by spaces, you want to build images for, and deploy.

# By default, only basic components are deployed

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device automation monitoring pathcomp service slice compute webui load_generator"}

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice nbi webui load_generator bgpls_speaker"}



# If not already set, set the tag you want to use for your images.

export TFS_IMAGE_TAG=${TFS_IMAGE_TAG:-"dev"}
@@ -47,7 +47,7 @@ export TFS_SKIP_BUILD=${TFS_SKIP_BUILD:-"YES"} 


# If TFS_SKIP_BUILD is "YES", select the containers to be build

# Any other container will use previous docker images

export TFS_QUICK_COMPONENTS="compute"

export TFS_QUICK_COMPONENTS="bgpls_speaker"



# ----- CockroachDB ------------------------------------------------------------