From b1bcbf9a01073841f6028ae8847960571f8b5bc9 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 11 Sep 2020 14:24:54 +0000 Subject: [PATCH] Added Dockerfiles to be used in the new pipeline Change-Id: I37a3a7be850a879cfb39063efb2ef56cb2d1faf0 Signed-off-by: garciadeblas --- Dockerfile.production | 110 ++++++++++++++++++++++++++++++++++++++++++ Dockerfile.testing | 54 +++++++++++++++++++++ Jenkinsfile.new | 1 + 3 files changed, 165 insertions(+) create mode 100644 Dockerfile.production create mode 100644 Dockerfile.testing diff --git a/Dockerfile.production b/Dockerfile.production new file mode 100644 index 0000000..3b30ec5 --- /dev/null +++ b/Dockerfile.production @@ -0,0 +1,110 @@ +# 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. + +# This creates osm/NBI docker from local NBI source code + +FROM ubuntu:18.04 + +# Set the working directory to /app +WORKDIR /app/NBI + +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections + +RUN apt-get update && apt-get install -y git python3 \ + python3-pymongo python3-yaml python3-pip python3-keystoneclient \ + && python3 -m pip install pip --upgrade \ + && python3 -m pip install aiokafka aiohttp cherrypy==18.1.2 keystoneauth1 requests jsonschema==3.2.0 \ + && mkdir -p /app/storage/kafka && mkdir -p /app/log + +# OSM_COMMON +RUN git -C /app clone https://osm.etsi.org/gerrit/osm/common.git \ + && git -C /app/common checkout master \ + && python3 -m pip install -e /app/common +# && cd common && python3 setup.py develop && cd .. +# && pip3 install -U -r requirements.txt \ +# && cd .. + +# OSM_IM +RUN git -C /app clone https://osm.etsi.org/gerrit/osm/IM \ + && git -C /app/IM checkout master \ + && python3 -m pip install /app/IM + +EXPOSE 9999 + +LABEL Maintainer="alfonso.tiernosepulveda@telefonica.com" \ + Description="This implements a north bound interface for OSM" \ + Version="1.0" \ + Author="Alfonso Tierno" + +# Used for local storage +VOLUME /app/storage +# Used for logs +VOLUME /app/log + +# The following ENV can be added with "docker run -e xxx' to configure +# server +ENV OSMNBI_SOCKET_HOST 0.0.0.0 +ENV OSMNBI_SOCKET_PORT 9999 +ENV OSMNBI_SERVER_SSL_CERTIFICATE /app/NBI/osm_nbi/http/cert.pem +ENV OSMNBI_SERVER_SSL_PRIVATE_KEY /app/NBI/osm_nbi/http/privkey.pem +# storage +ENV OSMNBI_STORAGE_DRIVER local +ENV OSMNBI_STORAGE_PATH /app/storage +#ENV OSMNBI_STORAGE_DRIVER mongo +#ENV OSMNBI_STORAGE_URI mongodb://mongo:27017 +#ENV OSMNBI_STORAGE_COLLECTION files +# database +ENV OSMNBI_DATABASE_DRIVER mongo +ENV OSMNBI_DATABASE_HOST mongo +ENV OSMNBI_DATABASE_PORT 27017 +# ENV OSMNBI_DATABASE_USER xxx +# ENV OSMNBI_DATABASE_PASSWORD xxx +# ENV OSMNBI_DATABASE_COMMONKEY xxx +# web +ENV OSMNBI_STATIC_DIR /app/NBI/osm_nbi/html_public +# logs +# ENV OSMNBI_LOG_FILE /app/log/nbi.log +ENV OSMNBI_LOG_LEVEL DEBUG +# ENV OSMNBI_SERVER_ENABLE_TEST False + +# message +ENV OSMNBI_MESSAGE_DRIVER kafka +ENV OSMNBI_MESSAGE_HOST kafka +ENV OSMNBI_MESSAGE_PORT 9092 +# authentication +ENV OSMNBI_AUTHENTICATION_BACKEND internal +#ENV OSMNBI_AUTHENTICATION_BACKEND keystone +#ENV OSMNBI_AUTHENTICATION_AUTH_URL http://keystone:5000/v3 +#ENV OSMNBI_AUTHENTICATION_AUTH_PORT 5000 + +# DOMAIN_NAME can be a single value or a comma separated list of values. The first value is for internal domain +# meanwhile the rest ones are external identity services as e.g. LDAP +# for the case of USER_DOMAIN_NAME each item can be suffixed with ":ro" (read only). In this case NBI will reject any +# operationi of create/update/delete users in this domain. Do not suffix PROJECT_DOMAIN_NAME +#ENV OSMNBI_AUTHENTICATION_USER_DOMAIN_NAME default +#ENV OSMNBI_AUTHENTICATION_PROJECT_DOMAIN_NAME default +#ENV OSMNBI_AUTHENTICATION_SERVICE_USERNAME nbi +#ENV OSMNBI_AUTHENTICATION_SERVICE_PASSWORD nbi +#ENV OSMNBI_AUTHENTICATION_SERVICE_PROJECT service +# RBAC +ENV OSMNBI_RBAC_RESOURCES_TO_OPERATIONS /app/NBI/osm_nbi/resources_to_operations.yml +ENV OSMNBI_RBAC_ROLES_TO_OPERATIONS /app/NBI/osm_nbi/roles_to_operations.yml +# prometheus +ENV OSMNBI_PROMETHEUS_HOST prometheus +ENV OSMNBI_PROMETHEUS_PORT 9090 + +# Copy the current directory contents into the container at /app +ADD . /app/NBI + +# Run app.py when the container launches +CMD python3 -m osm_nbi.nbi diff --git a/Dockerfile.testing b/Dockerfile.testing new file mode 100644 index 0000000..49b2cfa --- /dev/null +++ b/Dockerfile.testing @@ -0,0 +1,54 @@ +# Copyright 2018 Telefonica S.A. +# +# 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. + +# This Dockerfile is intented for devops and deb package generation +# +# Use Dockerfile.local for running osm/NBI in a docker container from source +# Use Dockerfile.fromdeb for running osm/NBI in a docker container from last stable package + + +FROM ubuntu:18.04 + +RUN apt-get update && apt-get -y install wget git make python python3 \ + libcurl4-gnutls-dev libgnutls28-dev tox python3-dev python3-pip \ + debhelper python-setuptools python-all python3-all apt-utils \ + python-magic && \ + DEBIAN_FRONTEND=noninteractive pip3 install -U stdeb setuptools-version-command + + + +############################################# +# TODO: PIP dependencies specific for testing: +############################################# + +# Main requirements +COPY requirements.txt ./ +COPY test-requirements.txt ./ +RUN python3 -m pip install -r requirements.txt +RUN python3 -m pip install -r test-requirements.txt + +# Linting (flake8) requirements +RUN python3 -m pip install flake8 + +# Requirements for build for testenv +RUN python3 -m pip install stdeb setuptools-version-command + +# unittest requirements +RUN python3 -m pip install asynctest aioresponses + +# Coverage tests +#RUN python3 -m pip install nose2 nose2-cov coverage + +#------------------------------------ diff --git a/Jenkinsfile.new b/Jenkinsfile.new index d9b53dd..0d8cddb 100644 --- a/Jenkinsfile.new +++ b/Jenkinsfile.new @@ -74,6 +74,7 @@ pipeline { stage('Build image') { steps{ echo "Building ${params.IMAGENAME}:${env.BUILD_NUMBER} image:" + // Here we have to use Dockerfile.production script { dockerImage = docker.build "${params.IMAGENAME}:${env.BUILD_NUMBER}" } -- 2.25.1