diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/Dockerfile b/services/TS29222_CAPIF_API_Invoker_Management_API/Dockerfile index b6ac739a43c7b222d93382abd97823b1b02ac605..2d8bbe74dae1305697234308fd67e65f05f82920 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 80a967965ffe38166ea3fa42480e7bee5f5ffe95..a6ee27499f6c07ccfa46f443bfa9c9c3dddcc666 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 1d0cf670956de59a58056edbce3e746f31dd085a..b10cb585a4ba305ee3ecf4eee64194f49d4f4a25 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 4b0f408419dd7b15a307b6729f6f7b784bdc9555..909445e22087b5f3cb04c9c08405a8eea5b59d32 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 f6ae45664e72189d675782771ba9b00676eb801e..350f5883ead9947dc54a608eee32cf2379d8d9fa 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 f67e521b510a8783898ecbe5030bba9c38f96618..b69327af156c0105c49fd0378186c6ebe1d4ea94 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 ba682680511a7bf3696857e443dce35a03f1da12..d68f8ce5c0030446f8e5c5a32f09ac0abc5f7cd3 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 6dbea7529db338dbafece2ebd742897865163c0e..fc3504b1abcb82718b3d0079bb59cb3be5e93b93 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 7b938f865aae4ec9b45f3b2a497a9e615f6e7970..0f3e0e4662735f614c19a357c185d424463d04cb 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 b080aeb854e581dfe61431911a53c6deaedd7666..eef4705c082320893abe94ba90159b54187b47e1 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 84508425ec798892599d3d6e22e40c99b72f9f81..78c9a2e0bd3f1de4d6d1052bb9de694e00569408 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 4a5e9f794752213603150f5dd5db1475c5f62b5a..b8c19362be49d04ebe2fb1f09a975bd8b754245d 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 a1dc5e8c30bc017423631981e2a9434ecef9cbe7..c87732c5ba562af7dac31974b62bc560a47faef1 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 514820865b5cf81a7359724e0f6e2b1587193afd..bb03b219822ebcd8641e50013b0e6b84d72ece6e 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 39b2402a2cf01a342a33e5b9a958bf9276cce9ff..3784374687e0287a1c4f17bd1fe54a060b12493f 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 0eced912f088adee63778217b87ab3a7d1a846b1..ebf61f5dffc5cc0ae8f8178adac90d889c4b49d4 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