y3

.dockerignore

-# temporal for refactor
-/src.*/
-# development ignore
-/config.yaml
-/predictor_config.txt
-/data/
-/data/models/
-/.vscode/
+.travis.yaml
+.openapi-generator-ignore
+README.md
+tox.ini
+git_push.sh
+test-requirements.txt
+setup.py
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -17,6 +16,7 @@ __pycache__/
 
 # Distribution / packaging
 .Python
+env/
 build/
 develop-eggs/
 dist/
@@ -28,12 +28,9 @@ lib64/
 parts/
 sdist/
 var/
-wheels/
-share/python-wheels/
 *.egg-info/
 .installed.cfg
 *.egg
-MANIFEST
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -48,17 +45,15 @@ pip-delete-this-directory.txt
 # Unit test / coverage reports
 htmlcov/
 .tox/
-.nox/
 .coverage
 .coverage.*
 .cache
 nosetests.xml
 coverage.xml
-*.cover
-*.py,cover
+*,cover
 .hypothesis/
-.pytest_cache/
-cover/
+venv/
+.python-version
 
 # Translations
 *.mo
@@ -66,96 +61,12 @@ cover/
 
 # Django stuff:
 *.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
 
 # Sphinx documentation
 docs/_build/
 
 # PyBuilder
-.pybuilder/
 target/
 
-# Jupyter Notebook
+#Ipython Notebook
 .ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
-# PyCharm
-#  JetBrains specific template is maintainted in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
\ No newline at end of file

.env.gen

+# Reference documentation https://docs.docker.com/compose/environment-variables/
+# Focus default variables as production, to allow direct download and run in production
+# Required external variables that must be defined externally are those that have no value
+
+#### Environments managed ####
+# this is the default environment if needed uncomment and adjust
+# some conventions on environment prefixes
+# - development: purpouse is to cache build and start the setup locally using cache images exposing dev ports (i.e 3306, 5432, 8086, ...) for debug and development purposes. It is the default behaviour (local:run-build-cache)
+# - release: purpouse is to generate images (that do not use BUILDKIT_INLINE_CACHE 1) tagged for the clients/pilots usage (release:run-build-release)
+# - prod: purpose is to generate non building docker-compose that uses the release to deploy on generic client (prod:run-release)
+# - test: the purpouse is to test from the cache images the correct behaviour without exposing ports (test:run-cache)
+# types of building
+# - run-build-cache: it focuses in the generation of images with BUILDKIT_INLINE_CACHE 1 for its usage in the cache-from for subsequent build, for each compose-file in compose-file build it finds build/cache the same name to add it to the build, it will use cache from.
+# - run-build-release: it focuses in the generation of images for distribution it avoid using BUILDKIT_INLINE_CACHE 1 to reduce the size, it will use cache from.
+# - build-cache: it focuses in the generation of images with BUILDKIT_INLINE_CACHE 1 for its usage in the cache-from for subsequent build, for each compose-file in compose-file build it finds build/cache the same name to add it to the build, it will use cache from.
+# - build-release: it focuses in the generation of images for distribution it avoid using BUILDKIT_INLINE_CACHE 1 to reduce the size, it will not use cache from.
+# - run-cache: it runs using cache images
+# - run-release: it runs using release images
+# default enviroment 
+# __ENVIRONMENTS=development:run-build-cache
+# to add more enviroments use split with ";"
+__ENVIRONMENTS=development:run-build-cache;prod:run-release;release:build-release
+
+#### Modules managed ####
+# this will create individual docker composes that enables the individual usage of the modules through the docker-compose command and specific env files i.e.
+# __MODULES=traefik;step-ca
+# will enable the following docker-compose commands
+# docker-compose --env-file .env/modules/traefik/prod ----project-directory . up -d
+# __MODULES=traefik;step-ca
+__MODULES=psl
+
+#### default environment ####
+# __DEFAULT_ENVIRONMENT=.envs/global/prod
+
+#### default environment ####
+# __DEFAULT_DEVELOPMENT_ENVIRONMENT=.envs/global/development
+
+#### default release environment ####
+# __DEFAULT_RELEASE_ENVIRONMENT=.envs/global/release
+
+#### Common image related ####
+DOCKER_REGISTRY_CACHE_PREFIX=cache.euve.digital.tecnalia.dev:5000
+DOCKER_REGISTRY_CACHE_VERSION=latest
+
+#### Common Build related ####
+# DOCKER_BUILDKIT and COMPOSE_DOCKER_CLI_BUILD do not have effect here, we leave them as documentation
+# DOCKER_BUILDKIT=1
+# COMPOSE_DOCKER_CLI_BUILD=1
+
+### Common Traefik related ###
+TRAEFIK_NETWORK_NAME=traefik_network
+TRAEFIK_HTTPS_ENTRYPOINT_NAME=websecure
+# TRAEFIK_HTTP_ENTRYPOINT_NAME=web
+
+#### Common Production related ####
+ADMIN_USER=admin
+ADMIN_PASSWORD=projectPassword
+# to calculate password hash `openssl passwd -apr1 $ADMIN_PASSWORD`
+# ADMIN_PASSWORD_HASH='$apr1$chTuJ7f9$.Ul8E16QYHtydKw.ehzZC.'
+# to calculate password bcrypt hash `sudo apt-get update; sudo apt-get install -y apache2-utils; htpasswd -bnBC 12 "" $ADMIN_PASSWORD | tr -d ':\n'`
+# ADMIN_PASSWORD_BCRYPT_HASH='$2y$12$NxJ.FkLgDZWWjc15y9bhX./GOTp67krCxWPanJLyCjofKyIN.zS96'
+# HTTPS_PORT must be 443 if you use step-ca
+HTTPS_PORT=443
+# server host is configured during the sync based on _ENV_LOCAL_ and _ENV_DEPLOY, _ENV_LOCAL_ will be used for test and release unless _ENV_RELEASE_ or _ENV_TEST_ specified
+# SERVER_HOST=project.org
+SERVER_HOST=ci.piacere.digital.tecnalia.dev
+
+#### Platform Specific ####
+TZ=Madrid
+INFLUXD_ORG=piacere
+
+#### Common docker-compose related ####
+# https://docs.docker.com/compose/reference/envvars/#compose_file#compose_project_name
+# these are docker-compose related environment variables
+COMPOSE_PROJECT_NAME=psl
+# _ENV_LOCAL_COMPOSE_FILE_BASE= # These are oriented for local vagrant usually it contains local traefik configuration, dev services, etc
+# _ENV_RELEASE_COMPOSE_FILE_BASE= # These are oriented for tagging relevant images for upload to official release repositories
+# _ENV_DEPLOY_COMPOSE_FILE_BASE= # These are oriented for final deployment it contains production traefik configuration, etc
+# _ENV_TEST_COMPOSE_FILE_BASE= # These are oriented for testing
+# COMPOSE_FILE_BASE= # (MANDATORY) These are those main services of the project, that will apply to all the scenarios
+
+COMPOSE_FILE_BASE=
+
+COMPOSE_FILE=
+# COMPOSE_FILE Is generated automatically
+
+__psl__COMPOSE_FILE_BASE=docker-compose.yaml
+__psl__COMPOSE_FILE_BASE_NETWORK=docker-compose-traefik-network-external.yaml
+
+__psl__PSL_BASE_PATH=
+
+__psl_development__SERVER_HOST=192.168.56.1.nip.io
+
+__psl__IMAGE_PSL=optima-piacere-docker-dev.artifact.tecnalia.com/wp6/psl:y3
+__psl__IMAGE_PSL_CACHE=optima-piacere-docker-dev.artifact.tecnalia.com/wp6/psl:y3
+
+__psl_development__COMPOSE_FILE_BASE_DEV=docker-compose-dev.yaml
+
+__psl_release__COMPOSE_FILE_BASE_PIACERE_BUILD=piacere-build/docker-compose.yaml
+__psl_release__COMPOSE_FILE_BASE_PIACERE_RELEASE=release/docker-compose.yaml
+__psl_release__COMPOSE_FILE_BASE_ARTIFACTORY=docker-compose-artifactory.yaml
+__psl_release__COMPOSE_FILE_BASE_TRAEFIK_NETWORK=docker-compose-traefik-network-internal.yaml
+
+
+
+

.envs/global/development

+DOCKER_REGISTRY_CACHE_PREFIX=cache.euve.digital.tecnalia.dev:5000
+DOCKER_REGISTRY_CACHE_VERSION=latest
+ADMIN_USER=admin
+ADMIN_PASSWORD=projectPassword
+HTTPS_PORT=443
+SERVER_HOST=192.168.56.1.nip.io
+INFLUXD_ORG=piacere
+COMPOSE_PROJECT_NAME=psl
+PSL_BASE_PATH=
+IMAGE_PSL=optima-piacere-docker-dev.artifact.tecnalia.com/wp6/psl:y3
+IMAGE_PSL_CACHE=optima-piacere-docker-dev.artifact.tecnalia.com/wp6/psl:y3
+COMPOSE_FILE=docker-compose.yaml:docker-compose-traefik-network-external.yaml:docker-compose-dev.yaml:build/docker-compose.yaml:build/inline-cache/docker-compose.yaml:build/image/docker-compose.yaml

.envs/global/prod

+ADMIN_USER=admin
+ADMIN_PASSWORD=projectPassword
+HTTPS_PORT=443
+SERVER_HOST=ci.piacere.digital.tecnalia.dev
+INFLUXD_ORG=piacere
+COMPOSE_PROJECT_NAME=psl
+IMAGE_PSL=optima-piacere-docker-dev.artifact.tecnalia.com/wp6/psl:y3
+COMPOSE_FILE=docker-compose.yaml:docker-compose-traefik-network-external.yaml:release/docker-compose.yaml

.envs/global/release

+TRAEFIK_NETWORK_NAME=traefik_network
+ADMIN_USER=admin
+ADMIN_PASSWORD=projectPassword
+HTTPS_PORT=443
+SERVER_HOST=ci.piacere.digital.tecnalia.dev
+INFLUXD_ORG=piacere
+COMPOSE_PROJECT_NAME=psl
+PSL_BASE_PATH=
+IMAGE_PSL=optima-piacere-docker-dev.artifact.tecnalia.com/wp6/psl:y3
+IMAGE_PSL_CACHE=optima-piacere-docker-dev.artifact.tecnalia.com/wp6/psl:y3
+COMPOSE_FILE=docker-compose.yaml:docker-compose-traefik-network-external.yaml:piacere-build/docker-compose.yaml:release/docker-compose.yaml:docker-compose-artifactory.yaml:docker-compose-traefik-network-internal.yaml:build/docker-compose.yaml

.envs/modules/psl/development

+DOCKER_REGISTRY_CACHE_PREFIX=cache.euve.digital.tecnalia.dev:5000
+DOCKER_REGISTRY_CACHE_VERSION=latest
+ADMIN_USER=admin
+ADMIN_PASSWORD=projectPassword
+HTTPS_PORT=443
+SERVER_HOST=192.168.56.1.nip.io
+INFLUXD_ORG=piacere
+COMPOSE_PROJECT_NAME=psl
+PSL_BASE_PATH=
+IMAGE_PSL=optima-piacere-docker-dev.artifact.tecnalia.com/wp6/psl:y3
+IMAGE_PSL_CACHE=optima-piacere-docker-dev.artifact.tecnalia.com/wp6/psl:y3
+COMPOSE_FILE=docker-compose.yaml:docker-compose-traefik-network-external.yaml:docker-compose-dev.yaml:build/docker-compose.yaml:build/inline-cache/docker-compose.yaml:build/image/docker-compose.yaml

.envs/modules/psl/prod

+ADMIN_USER=admin
+ADMIN_PASSWORD=projectPassword
+HTTPS_PORT=443
+SERVER_HOST=ci.piacere.digital.tecnalia.dev
+INFLUXD_ORG=piacere
+COMPOSE_PROJECT_NAME=psl
+IMAGE_PSL=optima-piacere-docker-dev.artifact.tecnalia.com/wp6/psl:y3
+COMPOSE_FILE=docker-compose.yaml:docker-compose-traefik-network-external.yaml:release/docker-compose.yaml

.envs/modules/psl/release

+TRAEFIK_NETWORK_NAME=traefik_network
+ADMIN_USER=admin
+ADMIN_PASSWORD=projectPassword
+HTTPS_PORT=443
+SERVER_HOST=ci.piacere.digital.tecnalia.dev
+INFLUXD_ORG=piacere
+COMPOSE_PROJECT_NAME=psl
+PSL_BASE_PATH=
+IMAGE_PSL=optima-piacere-docker-dev.artifact.tecnalia.com/wp6/psl:y3
+IMAGE_PSL_CACHE=optima-piacere-docker-dev.artifact.tecnalia.com/wp6/psl:y3
+COMPOSE_FILE=docker-compose.yaml:docker-compose-traefik-network-external.yaml:piacere-build/docker-compose.yaml:release/docker-compose.yaml:docker-compose-artifactory.yaml:docker-compose-traefik-network-internal.yaml:build/docker-compose.yaml

.gitignore

@@ -7,6 +7,8 @@
 /data/models/
 /.vscode/
 /requirement-stable.txt
+# open api ignore
+/.openapi-generator/
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -18,7 +20,7 @@ __pycache__/
 
 # Distribution / packaging
 .Python
-build/
+# build/
 develop-eggs/
 dist/
 downloads/

.gitlab-ci.yml

-sonarqube-check:
-  image: 
-    name: sonarsource/sonar-scanner-cli:latest
-    entrypoint: [""]
+include:
+  - project: piacere/private/t23-ci-setup
+    ref: main
+    file:
+      - gitlab-ci-scripts/utils.gitlab-ci.yml
+
+      # Image tag variables generation job -------------
+      # Stage: variable-generation ---------------------
+      - gitlab-ci-scripts/generate-variables.gitlab-ci.yml
+
+      # Downstream t23-ci-setup pipeline trigger job ---
+      # Stage: integration-tests-publish-deploy --------
+      - gitlab-ci-scripts/trigger-downstream.gitlab-ci.yml
+
+
+variables:
+  COMPONENT_WP: wp6
+  PSL_IMAGE_NAME: psl
+  
+  IMAGE_NAMES: "$PSL_IMAGE_NAME"
+
+stages:
+  - variable-generation
+  # - quality
+  # - unit-tests TODO: Fix tests
+  - build
+  # - security
+  - integration-tests-publish-deploy
+
+# Quality jobs ----------------------
+
+#sonarqube-check:
+# TODO fails
+#  image: 
+#    name: sonarsource/sonar-scanner-cli:latest
+#    entrypoint: [""]
+#  stage: quality
+#  variables:
+#    SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar"  # Defines the location of the analysis task cache
+#    GIT_DEPTH: "0"  # Tells git to fetch all the branches of the project, required by the analysis task
+#  cache:
+#    key: "${CI_JOB_NAME}"
+#    paths:
+#      - .sonar/cache
+#  script: 
+#    - sonar-scanner
+#  allow_failure: true
+#  tags:
+#    - docker
+
+# Build jobs ----------------------
+
+.build-docker-compose:
+  # image: docker/compose:1.29.2 # this is too old
+  image: docker:23.0.1
+  stage: build
+  services:
+    # - docker:20.10.21-dind # not sure if this is the latest
+    - docker:dind
   variables:
-    SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar"  # Defines the location of the analysis task cache
-    GIT_DEPTH: "0"  # Tells git to fetch all the branches of the project, required by the analysis task
-  cache:
-    key: "${CI_JOB_NAME}"
-    paths:
-      - .sonar/cache
+    GIT_DEPTH: 1
+    GIT_SUBMODULE_STRATEGY: recursive
+    GIT_SUBMODULE_DEPTH: 1
+    DOCKER_BUILDKIT: 1
+    COMPOSE_DOCKER_CLI_BUILD: 1
+    DOCKER_COMPOSE_PATH: "."
+    DOCKER_COMPOSE_ENV_FILE_CACHE: ".envs/global/release"
+    DOCKER_COMPOSE_ENV_FILE: ".envs/global/release"
+  before_script:
+    - !reference [.artifactory-login]
   script:
-    - sonar-scanner
-  allow_failure: true
-  only:
-    - main # or the name of your main branch
+    - apk add docker-compose
+    - cd $DOCKER_COMPOSE_PATH
+    - docker-compose --env-file $DOCKER_COMPOSE_ENV_FILE_CACHE --project-directory ./ pull || true
+    - docker-compose --env-file $DOCKER_COMPOSE_ENV_FILE_CACHE --project-directory ./ config
+    - docker-compose --env-file $DOCKER_COMPOSE_ENV_FILE --project-directory ./ build
+    - docker-compose --env-file $DOCKER_COMPOSE_ENV_FILE --project-directory ./ push
+    - docker-compose --env-file $DOCKER_COMPOSE_ENV_FILE --project-directory ./ config | grep image
   tags:
     - docker
 
+build-temp-docker-compose:
+  extends:
+    - .build-docker-compose
+  variables:
+    IMAGE_PSL: "$TMP_IMAGE_PSL"
+
+build-release-docker-compose:
+  extends:
+    - .build-docker-compose
+  when: manual
+
+# Security job in tests stage------------------------
+
+# security-trivy-psl:
+#   stage: security
+#   variables:
+#     TMP_IMAGE: "$TMP_IMAGE_PSL"
+#   trigger: !reference [.trigger-security-trivy]
+#   needs:
+#     - job: build-temp-docker-compose
+#     - job: generate-variables
+#       artifacts: true
+
+# Tests jobs ------------------------
+
+# TODO: Tests are failing. There is a problem with imports
+
+# run-unit-tests:
+#   image: python:3.9
+#   stage: unit-tests
+#   before_script:
+#     - pip install tox
+#   script:
+#     - tox
+#   tags:
+#     - docker
+
+# Deploy job ------------------------
+
+# this is done in stage integration-tests-publish-deploy
+# in jobs from t23-ci-setup

.openapi-generator/FILES

-.dockerignore
-.travis.yml
-README.md
-git_push.sh
-setup.py
-src/psl/__init__.py
-src/psl/__main__.py
-src/psl/controllers/__init__.py
-src/psl/controllers/security_controller_.py
-src/psl/controllers/self_learning_controller.py
-src/psl/encoder.py
-src/psl/models/__init__.py
-src/psl/models/base_model_.py
-src/psl/models/error.py
-src/psl/openapi/openapi.yaml
-src/psl/test/__init__.py
-src/psl/typing_utils.py
-src/psl/util.py
-test-requirements.txt
-tox.ini

.openapi-generator/VERSION

-5.3.0
\ No newline at end of file

Dockerfile

-FROM python:3.9-alpine3.12
+FROM python:3.9-slim-bullseye
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
@@ -6,14 +6,18 @@ WORKDIR /usr/src/app
 COPY requirements.txt /usr/src/app/
 
 RUN \
-   apk add --no-cache gcc libffi-dev musl-dev zlib-dev jpeg-dev g++ make cairo-dev openblas-dev lapack-dev qt5-qtbase-dev &&\
-   ln -s /usr/lib/qt5/bin/qmake /usr/bin/qmake &&\
-   CFLAGS="-g0 -Wl,--strip-all -I/usr/include:/usr/local/include -L/usr/lib:/usr/local/lib" pip3 install --no-cache-dir --compile --global-option=build_ext -r requirements.txt &&\ 
-   apk del gcc libffi-dev musl-dev zlib-dev jpeg-dev g++ make cairo-dev openblas-dev lapack-dev qt5-qtbase-dev &&\
-   rm -rf ~/.cache
-
-RUN \
-   apk add --no-cache openblas libstdc++ libgomp libjpeg libxcb cairo qt5-qtbase
+apt-get update -eany \
+    && apt-get upgrade -y --no-install-recommends \
+    && apt-get install -y --no-install-recommends \
+    gcc \
+    libcairo2-dev \
+&& pip3 install -r requirements.txt \
+    && apt-get remove -y \
+    gcc \
+    libcairo2-dev \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf ~/.cache
 
 COPY /src/clients /usr/src/app/clients
 

Dockerfile-alpine

+FROM python:3.9-alpine3.12
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+COPY requirements.txt /usr/src/app/
+
+RUN \
+   apk add --no-cache gcc libffi-dev musl-dev zlib-dev jpeg-dev g++ make cairo-dev openblas-dev lapack-dev qt5-qtbase-dev &&\
+   ln -s /usr/lib/qt5/bin/qmake /usr/bin/qmake &&\
+   CFLAGS="-g0 -Wl,--strip-all -I/usr/include:/usr/local/include -L/usr/lib:/usr/local/lib" pip3 install --no-cache-dir --compile --global-option=build_ext -r requirements.txt &&\ 
+   apk del gcc libffi-dev musl-dev zlib-dev jpeg-dev g++ make cairo-dev openblas-dev lapack-dev qt5-qtbase-dev &&\
+   rm -rf ~/.cache
+
+RUN \
+   apk add --no-cache openblas libstdc++ libgomp libjpeg libxcb cairo qt5-qtbase
+
+COPY /src/clients /usr/src/app/clients
+
+RUN \
+    pip3 install --no-cache-dir --compile --global-option=build_ext -e clients/sh_client
+
+COPY /src/psl /usr/src/app/psl
+
+EXPOSE 8080
+
+ENV PSL__REPOSITORY__FILE=/data/deployments_data \
+    PSL__PREDICTOR_ADAPTER__MODELS_PATH=/data/models
+
+VOLUME /data
+
+ENTRYPOINT ["python3"]
+
+CMD ["-m", "psl"]

LICENSE

+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2022 Tecnalia
+
+   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.

README.md

@@ -80,7 +80,7 @@ Use your favourite IDE, or editing tool.
 This program requires a conection to influxdb and to self healing therefore you need to provide the conection details in config.yaml or using environment variables i.e. 
 
 ```
-export PSL__INFLUXDB__CONNECTION__URL=http://pmc-influxdb:8086
+export PSL__INFLUXDB__CONNECTION__URL=http://pm-influxdb:8086
 export PSL__SH_CLIENT_ADAPTER__URL=http://sh-gateway:8080/services/shbackend
 export PSL_INFLUXDB_ORG=piacere
 export PSL_INFLUXDB_USERNAME=piacere

build/docker-compose.yaml

+services:
+  psl:
+    build:
+      context: ${PSL_BASE_PATH}.
+      dockerfile: Dockerfile
+      cache_from:
+        - ${IMAGE_PSL_CACHE:?err}

build/image/docker-compose.yaml

+services:
+  psl:
+    image: ${DOCKER_REGISTRY_CACHE_PREFIX}/piacere/psl:${DOCKER_REGISTRY_CACHE_VERSION:?err}

build/inline-cache/docker-compose.yaml

+services:
+  psl:
+    build:
+      cache_from:
+        - ${DOCKER_REGISTRY_CACHE_PREFIX}/piacere/psl:${DOCKER_REGISTRY_CACHE_VERSION:?err}
+      args:
+        BUILDKIT_INLINE_CACHE: 1 # For multistage docker

docker-compose-artifactory.yaml

+services:
+  psl:
+    build:
+      labels:
+        com.jfrog.artifactory.retention.maxCount: 6