From 7dcde71c89fbf5c919585fc68cc07847008e0992 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Tue, 1 Oct 2024 13:55:17 +0200 Subject: [PATCH] Setup etsi registry images --- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- services/TS29222_CAPIF_Auditing_API/Dockerfile | 2 +- .../Dockerfile | 2 +- services/TS29222_CAPIF_Events_API/Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../TS29222_CAPIF_Routing_Info_API/Dockerfile | 2 +- services/TS29222_CAPIF_Security_API/Dockerfile | 2 +- services/helper/Dockerfile | 2 +- services/mock_server/Dockerfile | 2 +- services/nginx/Dockerfile | 2 +- services/register/Dockerfile | 2 +- services/run.sh | 17 +++++++++++------ services/vault/Dockerfile | 2 +- 16 files changed, 26 insertions(+), 21 deletions(-) diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/Dockerfile b/services/TS29222_CAPIF_API_Invoker_Management_API/Dockerfile index b6ac739a..2d8bbe74 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/Dockerfile +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-slim-bullseye +FROM labs.etsi.org:5050/ocf/capif/python:3-slim-bullseye RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/Dockerfile b/services/TS29222_CAPIF_API_Provider_Management_API/Dockerfile index 80a96796..a6ee2749 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/Dockerfile +++ b/services/TS29222_CAPIF_API_Provider_Management_API/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-slim-bullseye +FROM labs.etsi.org:5050/ocf/capif/python:3-slim-bullseye RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/Dockerfile b/services/TS29222_CAPIF_Access_Control_Policy_API/Dockerfile index 1d0cf670..b10cb585 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/Dockerfile +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-slim-bullseye +FROM labs.etsi.org:5050/ocf/capif/python:3-slim-bullseye RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/services/TS29222_CAPIF_Auditing_API/Dockerfile b/services/TS29222_CAPIF_Auditing_API/Dockerfile index 4b0f4084..909445e2 100644 --- a/services/TS29222_CAPIF_Auditing_API/Dockerfile +++ b/services/TS29222_CAPIF_Auditing_API/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-slim-bullseye +FROM labs.etsi.org:5050/ocf/capif/python:3-slim-bullseye RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/services/TS29222_CAPIF_Discover_Service_API/Dockerfile b/services/TS29222_CAPIF_Discover_Service_API/Dockerfile index f6ae4566..350f5883 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/Dockerfile +++ b/services/TS29222_CAPIF_Discover_Service_API/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-slim-bullseye +FROM labs.etsi.org:5050/ocf/capif/python:3-slim-bullseye RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/services/TS29222_CAPIF_Events_API/Dockerfile b/services/TS29222_CAPIF_Events_API/Dockerfile index f67e521b..b69327af 100644 --- a/services/TS29222_CAPIF_Events_API/Dockerfile +++ b/services/TS29222_CAPIF_Events_API/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-slim-bullseye +FROM labs.etsi.org:5050/ocf/capif/python:3-slim-bullseye RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/Dockerfile b/services/TS29222_CAPIF_Logging_API_Invocation_API/Dockerfile index ba682680..d68f8ce5 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/Dockerfile +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-slim-bullseye +FROM labs.etsi.org:5050/ocf/capif/python:3-slim-bullseye RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/services/TS29222_CAPIF_Publish_Service_API/Dockerfile b/services/TS29222_CAPIF_Publish_Service_API/Dockerfile index 6dbea752..fc3504b1 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/Dockerfile +++ b/services/TS29222_CAPIF_Publish_Service_API/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-slim-bullseye +FROM labs.etsi.org:5050/ocf/capif/python:3-slim-bullseye RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/services/TS29222_CAPIF_Routing_Info_API/Dockerfile b/services/TS29222_CAPIF_Routing_Info_API/Dockerfile index 7b938f86..0f3e0e46 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/Dockerfile +++ b/services/TS29222_CAPIF_Routing_Info_API/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-slim-bullseye +FROM labs.etsi.org:5050/ocf/capif/python:3-slim-bullseye RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/services/TS29222_CAPIF_Security_API/Dockerfile b/services/TS29222_CAPIF_Security_API/Dockerfile index b080aeb8..eef4705c 100644 --- a/services/TS29222_CAPIF_Security_API/Dockerfile +++ b/services/TS29222_CAPIF_Security_API/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-slim-bullseye +FROM labs.etsi.org:5050/ocf/capif/python:3-slim-bullseye RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/services/helper/Dockerfile b/services/helper/Dockerfile index 84508425..78c9a2e0 100644 --- a/services/helper/Dockerfile +++ b/services/helper/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-slim-bullseye +FROM labs.etsi.org:5050/ocf/capif/python:3-slim-bullseye RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/services/mock_server/Dockerfile b/services/mock_server/Dockerfile index 4a5e9f79..b8c19362 100644 --- a/services/mock_server/Dockerfile +++ b/services/mock_server/Dockerfile @@ -1,5 +1,5 @@ # start by pulling the python image -FROM python:3-slim-bullseye +FROM labs.etsi.org:5050/ocf/capif/python:3-slim-bullseye # copy the requirements file into the image COPY ./requirements.txt /app/requirements.txt diff --git a/services/nginx/Dockerfile b/services/nginx/Dockerfile index a1dc5e8c..c87732c5 100644 --- a/services/nginx/Dockerfile +++ b/services/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.27.1 +FROM labs.etsi.org:5050/ocf/capif/nginx:1.27.1 RUN apt-get update && apt-get install -y jq && apt-get clean RUN apt-get install -y openssl RUN apt-get install -y curl diff --git a/services/register/Dockerfile b/services/register/Dockerfile index 51482086..bb03b219 100644 --- a/services/register/Dockerfile +++ b/services/register/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-slim-bullseye +FROM labs.etsi.org:5050/ocf/capif/python:3-slim-bullseye RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/services/run.sh b/services/run.sh index 39b2402a..37843746 100755 --- a/services/run.sh +++ b/services/run.sh @@ -10,6 +10,7 @@ help() { echo " -s : Run Mock server" echo " -m : Run monitoring service" echo " -l : Set Log Level (default DEBUG). Select one of: [CRITICAL, FATAL, ERROR, WARNING, WARN, INFO, DEBUG, NOTSET]" + echo " -r : Remove cached information on build" echo " -h : show this help" exit 1 } @@ -18,6 +19,7 @@ HOSTNAME=capifcore MONITORING_STATE=false DEPLOY=all LOG_LEVEL=DEBUG +CACHED_INFO="" # Needed to avoid write permissions on bind volumes with prometheus and grafana DUID=$(id -u) @@ -39,7 +41,7 @@ else fi # Read params -while getopts ":c:l:msh" opt; do +while getopts ":c:l:mshr" opt; do case $opt in c) HOSTNAME="$OPTARG" @@ -56,6 +58,9 @@ while getopts ":c:l:msh" opt; do l) LOG_LEVEL="$OPTARG" ;; + r) + CACHED_INFO="--no-cache" + ;; \?) echo "Not valid option: -$OPTARG" >&2 help @@ -73,7 +78,7 @@ if [ "$MONITORING_STATE" == "true" ] ; then echo '***Monitoring set as true***' echo '***Creating Monitoring stack***' - DUID=$DUID DGID=$DGID docker compose -f "$SERVICES_DIR/monitoring/docker-compose.yml" build + DUID=$DUID DGID=$DGID docker compose -f "$SERVICES_DIR/monitoring/docker-compose.yml" build $CACHED_INFO DUID=$DUID DGID=$DGID docker compose -f "$SERVICES_DIR/monitoring/docker-compose.yml" up --detach status=$? if [ $status -eq 0 ]; then @@ -87,7 +92,7 @@ fi docker network create capif-network # docker compose -f "$SERVICES_DIR/docker-compose-vault.yml" up --detach --build -docker compose -f "$SERVICES_DIR/docker-compose-vault.yml" build +docker compose -f "$SERVICES_DIR/docker-compose-vault.yml" build $CACHED_INFO docker compose -f "$SERVICES_DIR/docker-compose-vault.yml" up --detach status=$? if [ $status -eq 0 ]; then @@ -98,7 +103,7 @@ else fi # CAPIF_HOSTNAME=$HOSTNAME MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-capif.yml" up --detach --build -CAPIF_HOSTNAME=$HOSTNAME MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-capif.yml" build +CAPIF_HOSTNAME=$HOSTNAME MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-capif.yml" build $CACHED_INFO CAPIF_HOSTNAME=$HOSTNAME MONITORING=$MONITORING_STATE LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-capif.yml" up --detach status=$? @@ -112,7 +117,7 @@ fi CAPIF_PRIV_KEY_BASE_64=$(echo "$(cat nginx/certs/server.key)") # CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-register.yml" up --detach --build -CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-register.yml" build +CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-register.yml" build $CACHED_INFO CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 LOG_LEVEL=$LOG_LEVEL docker compose -f "$SERVICES_DIR/docker-compose-register.yml" up --detach status=$? @@ -128,7 +133,7 @@ if [ "$ROBOT_MOCK_SERVER" == "true" ] ; then echo '***Creating Robot Mock Server stack***' # IP=$IP PORT=$PORT docker compose -f "$SERVICES_DIR/docker-compose-mock-server.yml" up --detach - IP=$IP PORT=$PORT docker compose -f "$SERVICES_DIR/docker-compose-mock-server.yml" build + IP=$IP PORT=$PORT docker compose -f "$SERVICES_DIR/docker-compose-mock-server.yml" build $CACHED_INFO IP=$IP PORT=$PORT docker compose -f "$SERVICES_DIR/docker-compose-mock-server.yml" up --detach status=$? if [ $status -eq 0 ]; then diff --git a/services/vault/Dockerfile b/services/vault/Dockerfile index 0eced912..ebf61f5d 100644 --- a/services/vault/Dockerfile +++ b/services/vault/Dockerfile @@ -1,4 +1,4 @@ -FROM vault:1.13.2 +FROM labs.etsi.org:5050/ocf/capif/vault:1.13.2 # Instalar paquetes adicionales RUN apk add --no-cache jq openssl -- GitLab