diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/Dockerfile b/services/TS29222_CAPIF_API_Invoker_Management_API/Dockerfile index ac8732bcd88a9d3d26a6a0d7aacb78fdfaa749e2..d544fc17ee7f4ee4ec6a75c410de7f4c7daa948f 100644 --- a/services/TS29222_CAPIF_API_Invoker_Management_API/Dockerfile +++ b/services/TS29222_CAPIF_API_Invoker_Management_API/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine +FROM labs.etsi.org:5050/ocf/capif/python:3-alpine 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 5f2713c9eaf2187221eddce8996768dd5a684490..867e52dcf638efc0273547fd8c4eec997ec73e83 100644 --- a/services/TS29222_CAPIF_API_Provider_Management_API/Dockerfile +++ b/services/TS29222_CAPIF_API_Provider_Management_API/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine +FROM labs.etsi.org:5050/ocf/capif/python:3-alpine 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 9c1382590feac6390a85c9ac48dc55b64b805496..0de5ebba180dcd14bce63c02a4dc7aff64995a69 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/Dockerfile +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine +FROM labs.etsi.org:5050/ocf/capif/python:3-alpine 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 1d1de3244165065973eec8ff86e502001b178373..0435a4cfcf7ea5d2fa0edc17eabf6130ab9b78a5 100644 --- a/services/TS29222_CAPIF_Auditing_API/Dockerfile +++ b/services/TS29222_CAPIF_Auditing_API/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine +FROM labs.etsi.org:5050/ocf/capif/python:3-alpine 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 1478af82410e6e25457620961e115073ab1bcdbc..859ad379ab1d261818186d21a83055fbc94e4c86 100644 --- a/services/TS29222_CAPIF_Discover_Service_API/Dockerfile +++ b/services/TS29222_CAPIF_Discover_Service_API/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine +FROM labs.etsi.org:5050/ocf/capif/python:3-alpine 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 b8ba685688c633bd6ea2957c85839d6bf8a5555d..1fcfe7228aa4e1806619d4785e9f903a71458bce 100644 --- a/services/TS29222_CAPIF_Events_API/Dockerfile +++ b/services/TS29222_CAPIF_Events_API/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine +FROM labs.etsi.org:5050/ocf/capif/python:3-alpine 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 f7cd99b2c94367d6bd968f4ea597854e478ac9ec..55d6d831dc6fc7df27e54660ce76094b033cf8b9 100644 --- a/services/TS29222_CAPIF_Logging_API_Invocation_API/Dockerfile +++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine +FROM labs.etsi.org:5050/ocf/capif/python:3-alpine 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 eca440204cf38f6f3ff1b27757be21deaaac7d09..6a044e0dd3121d9388d82a439dc15d2b133eebbd 100644 --- a/services/TS29222_CAPIF_Publish_Service_API/Dockerfile +++ b/services/TS29222_CAPIF_Publish_Service_API/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine +FROM labs.etsi.org:5050/ocf/capif/python:3-alpine 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 470877e41836eedb6467794b8af2f4d7281c14cd..616c1db8f632fad65234c9acd123801cd5902b13 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/Dockerfile +++ b/services/TS29222_CAPIF_Routing_Info_API/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine +FROM labs.etsi.org:5050/ocf/capif/python:3-alpine 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 9f73be9b86061f4cd1055ed23a54261db97853fd..cb18c9d5e7f9771ab569c0efddb3f482f36fc3b6 100644 --- a/services/TS29222_CAPIF_Security_API/Dockerfile +++ b/services/TS29222_CAPIF_Security_API/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine +FROM labs.etsi.org:5050/ocf/capif/python:3-alpine RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/services/docker-compose-capif.yml b/services/docker-compose-capif.yml index 44ed625fcc13b5d64606b5316272bb989713ba4b..7d08526c90c10641ada9b79a3a6a756170626738 100644 --- a/services/docker-compose-capif.yml +++ b/services/docker-compose-capif.yml @@ -32,6 +32,7 @@ services: - VAULT_ACCESS_TOKEN=dev-only-token - VAULT_PORT=8200 - LOG_LEVEL=${LOG_LEVEL} + image: labs.etsi.org:5050/ocf/capif/helper:v2.x.x-release depends_on: - nginx @@ -50,7 +51,7 @@ services: - MONITORING=${MONITORING} - LOG_LEVEL=${LOG_LEVEL} restart: unless-stopped - image: public.ecr.aws/o2v4a8t6/opencapif/access-control-policy:3.1.3 + image: labs.etsi.org:5050/ocf/capif/access-control-policy:v2.x.x-release depends_on: - redis - nginx @@ -75,7 +76,7 @@ services: - VAULT_PORT=8200 - LOG_LEVEL=${LOG_LEVEL} restart: unless-stopped - image: public.ecr.aws/o2v4a8t6/opencapif/api-invoker-management-api:3.1.3 + image: labs.etsi.org:5050/ocf/capif/api-invoker-management-api:v2.x.x-release depends_on: - redis - nginx @@ -91,7 +92,7 @@ services: - fluent-bit:host-gateway - otel-collector:host-gateway - vault:host-gateway - image: public.ecr.aws/o2v4a8t6/opencapif/api-provider-management-api:3.1.3 + image: labs.etsi.org:5050/ocf/capif/api-provider-management-api:v2.x.x-release environment: - CONTAINER_NAME=api-provider-management - MONITORING=${MONITORING} @@ -115,7 +116,7 @@ services: - fluent-bit:host-gateway - otel-collector:host-gateway restart: unless-stopped - image: public.ecr.aws/o2v4a8t6/opencapif/auditing-api:3.1.3 + image: labs.etsi.org:5050/ocf/capif/auditing-api:v2.x.x-release environment: - CONTAINER_NAME=api-auditing - MONITORING=${MONITORING} @@ -135,7 +136,7 @@ services: - host.docker.internal:host-gateway - fluent-bit:host-gateway - otel-collector:host-gateway - image: public.ecr.aws/o2v4a8t6/opencapif/discover-service-api:3.1.3 + image: labs.etsi.org:5050/ocf/capif/discover-service-api:v2.x.x-release environment: - CONTAINER_NAME=services-apis - MONITORING=${MONITORING} @@ -149,7 +150,7 @@ services: - "8080" volumes: - ./TS29222_CAPIF_Events_API:/usr/src/app - image: public.ecr.aws/o2v4a8t6/opencapif/events-api:3.1.3 + image: labs.etsi.org:5050/ocf/capif/events-api:v2.x.x-release environment: - CONTAINER_NAME=api-events - MONITORING=${MONITORING} @@ -170,7 +171,7 @@ services: volumes: - ./TS29222_CAPIF_Logging_API_Invocation_API:/usr/src/app restart: unless-stopped - image: public.ecr.aws/o2v4a8t6/opencapif/api-invocation-logs-api:3.1.3 + image: labs.etsi.org:5050/ocf/capif/api-invocation-logs-api:v2.x.x-release extra_hosts: - host.docker.internal:host-gateway - fluent-bit:host-gateway @@ -190,7 +191,7 @@ services: volumes: - ./TS29222_CAPIF_Publish_Service_API:/usr/src/app restart: unless-stopped - image: public.ecr.aws/o2v4a8t6/opencapif/publish-service-api:3.1.3 + image: labs.etsi.org:5050/ocf/capif/publish-service-api:v2.x.x-release extra_hosts: - host.docker.internal:host-gateway - fluent-bit:host-gateway @@ -207,7 +208,7 @@ services: build: TS29222_CAPIF_Routing_Info_API/. expose: - "8080" - image: public.ecr.aws/o2v4a8t6/opencapif/routing-info-api:3.1.3 + image: labs.etsi.org:5050/ocf/capif/routing-info-api:v2.x.x-release capif-security: build: TS29222_CAPIF_Security_API/. @@ -216,7 +217,7 @@ services: volumes: - ./TS29222_CAPIF_Security_API:/usr/src/app restart: unless-stopped - image: public.ecr.aws/o2v4a8t6/opencapif/security-api:3.1.3 + image: labs.etsi.org:5050/ocf/capif/security-api:v2.x.x-release environment: - CAPIF_HOSTNAME=${CAPIF_HOSTNAME} - CONTAINER_NAME=api-security @@ -266,7 +267,7 @@ services: ports: - "8080:8080" - "443:443" - image: public.ecr.aws/o2v4a8t6/opencapif/nginx:3.1.3 + image: labs.etsi.org:5050/ocf/capif/nginx:v2.x.x-release environment: - CAPIF_HOSTNAME=${CAPIF_HOSTNAME} - VAULT_HOSTNAME=vault diff --git a/services/docker-compose-mock-server.yml b/services/docker-compose-mock-server.yml index 1415b439bb1eec214b6adbd5af74812432544bf1..0b941271b3cd299f38c1ad72a918d4fb8edbda41 100644 --- a/services/docker-compose-mock-server.yml +++ b/services/docker-compose-mock-server.yml @@ -9,7 +9,7 @@ services: extra_hosts: - host.docker.internal:host-gateway restart: unless-stopped - image: public.ecr.aws/o2v4a8t6/opencapif/mock_server:latest + image: labs.etsi.org:5050/ocf/capif/mock_server:latest networks: default: diff --git a/services/docker-compose-register.yml b/services/docker-compose-register.yml index 53ed1017428ae03d3ab074c7378884ce9d871ba3..3e29bb6a250cdcf0128d6a08cb423ec8822b0b68 100644 --- a/services/docker-compose-register.yml +++ b/services/docker-compose-register.yml @@ -16,7 +16,7 @@ services: - host.docker.internal:host-gateway - vault:host-gateway restart: unless-stopped - image: public.ecr.aws/o2v4a8t6/opencapif/jwtauth:3.1.3 + image: labs.etsi.org:5050/ocf/capif/register:v2.x.x-release depends_on: - mongo_register diff --git a/services/helper/Dockerfile b/services/helper/Dockerfile index 36439567b9077997dac2b88cb1f362d3affd77e2..f313ad8f36bb4f1512fa45066d3f7cfd982dad42 100644 --- a/services/helper/Dockerfile +++ b/services/helper/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine +FROM labs.etsi.org:5050/ocf/capif/python:3-alpine RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/services/mock_server/Dockerfile b/services/mock_server/Dockerfile index 6d72bf569899e6512254be59539231c0fb49b338..541395da8c166d2603a241b7cb2e1aa348fdd8c7 100644 --- a/services/mock_server/Dockerfile +++ b/services/mock_server/Dockerfile @@ -1,5 +1,5 @@ # start by pulling the python image -FROM python:3.10.0-alpine +FROM labs.etsi.org:5050/ocf/capif/python:3-alpine # copy the requirements file into the image COPY ./requirements.txt /app/requirements.txt diff --git a/services/nginx/Dockerfile b/services/nginx/Dockerfile index 7a10574a4758f008fc99fc9a751868eee05f47fe..e3f65827f5af498314941a4a5682ad150fbe3fda 100644 --- a/services/nginx/Dockerfile +++ b/services/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/o2v4a8t6/opencapif/nginx:base_1.23.1 +FROM labs.etsi.org:5050/ocf/capif/nginx:base_1.23.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=7.74.0-1.3+deb11u3 diff --git a/services/register/Dockerfile b/services/register/Dockerfile index 75357cd0d15fcaf10e62f1bec6610afbab208e03..03fb295e158be2bb1330c5c594e7c618783a5aea 100644 --- a/services/register/Dockerfile +++ b/services/register/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine +FROM labs.etsi.org:5050/ocf/capif/python:3-alpine RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/tools/robot/Dockerfile b/tools/robot/Dockerfile index 347f226da0bf93d5e1f8a9adaa18901c5dafc000..a7e18f87e260e8ad840cc867c2352c1dacfc4582 100644 --- a/tools/robot/Dockerfile +++ b/tools/robot/Dockerfile @@ -1,4 +1,4 @@ -FROM harbor.elevenpaths.com/dockerhub-proxy/library/ubuntu:20.04 +FROM labs.etsi.org:5050/ocf/capif/ubuntu:20.04 LABEL maintainer="Jorge Moratinos Salcines " LABEL version="2.0" LABEL description="Docker to run Robot Framework"