From 3a00e84a7d9db1c2d14d811a61e7bf7620ef03ac Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Thu, 12 Sep 2024 13:37:42 +0200 Subject: [PATCH 1/5] Change Dockerfiles images FROM to alpine and nginx uploaded to etsi --- services/TS29222_CAPIF_API_Invoker_Management_API/Dockerfile | 2 +- services/TS29222_CAPIF_API_Provider_Management_API/Dockerfile | 2 +- services/TS29222_CAPIF_Access_Control_Policy_API/Dockerfile | 2 +- services/TS29222_CAPIF_Auditing_API/Dockerfile | 2 +- services/TS29222_CAPIF_Discover_Service_API/Dockerfile | 2 +- services/TS29222_CAPIF_Events_API/Dockerfile | 2 +- services/TS29222_CAPIF_Logging_API_Invocation_API/Dockerfile | 2 +- services/TS29222_CAPIF_Publish_Service_API/Dockerfile | 2 +- services/TS29222_CAPIF_Routing_Info_API/Dockerfile | 2 +- services/TS29222_CAPIF_Security_API/Dockerfile | 2 +- services/helper/Dockerfile | 2 +- services/nginx/Dockerfile | 2 +- services/register/Dockerfile | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/Dockerfile b/services/TS29222_CAPIF_API_Invoker_Management_API/Dockerfile index ac8732b..d544fc1 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 5f2713c..867e52d 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 9c13825..0de5ebb 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 1d1de32..0435a4c 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 1478af8..859ad37 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 b8ba685..1fcfe72 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 f7cd99b..55d6d83 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 eca4402..6a044e0 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 470877e..616c1db 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 9f73be9..cb18c9d 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/helper/Dockerfile b/services/helper/Dockerfile index 3643956..f313ad8 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/nginx/Dockerfile b/services/nginx/Dockerfile index 7a10574..e3f6582 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 75357cd..03fb295 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 -- GitLab From 913c15f08e4797bb7df71f2a995f75dfb8c8014b Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Thu, 12 Sep 2024 13:49:34 +0200 Subject: [PATCH 2/5] Change image destination url on docker compose files --- services/docker-compose-capif.yml | 22 +++++++++++----------- services/docker-compose-mock-server.yml | 2 +- services/docker-compose-register.yml | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/services/docker-compose-capif.yml b/services/docker-compose-capif.yml index 44ed625..a43eae7 100644 --- a/services/docker-compose-capif.yml +++ b/services/docker-compose-capif.yml @@ -50,7 +50,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:3.1.3 depends_on: - redis - nginx @@ -75,7 +75,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:3.1.3 depends_on: - redis - nginx @@ -91,7 +91,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:3.1.3 environment: - CONTAINER_NAME=api-provider-management - MONITORING=${MONITORING} @@ -115,7 +115,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:3.1.3 environment: - CONTAINER_NAME=api-auditing - MONITORING=${MONITORING} @@ -135,7 +135,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:3.1.3 environment: - CONTAINER_NAME=services-apis - MONITORING=${MONITORING} @@ -149,7 +149,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:3.1.3 environment: - CONTAINER_NAME=api-events - MONITORING=${MONITORING} @@ -170,7 +170,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:3.1.3 extra_hosts: - host.docker.internal:host-gateway - fluent-bit:host-gateway @@ -190,7 +190,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:3.1.3 extra_hosts: - host.docker.internal:host-gateway - fluent-bit:host-gateway @@ -207,7 +207,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:3.1.3 capif-security: build: TS29222_CAPIF_Security_API/. @@ -216,7 +216,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:3.1.3 environment: - CAPIF_HOSTNAME=${CAPIF_HOSTNAME} - CONTAINER_NAME=api-security @@ -266,7 +266,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:3.1.3 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 1415b43..0b94127 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 53ed101..4092f5a 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/jwtauth:3.1.3 depends_on: - mongo_register -- GitLab From 54736071999abca589a86ef46a2d9dc609a2becc Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Fri, 13 Sep 2024 13:30:53 +0200 Subject: [PATCH 3/5] Setup public ubuntu docker image for robot dockerfile --- tools/robot/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/robot/Dockerfile b/tools/robot/Dockerfile index 347f226..a94c4b2 100644 --- a/tools/robot/Dockerfile +++ b/tools/robot/Dockerfile @@ -1,4 +1,4 @@ -FROM harbor.elevenpaths.com/dockerhub-proxy/library/ubuntu:20.04 +FROM ubuntu:20.04 LABEL maintainer="Jorge Moratinos Salcines " LABEL version="2.0" LABEL description="Docker to run Robot Framework" -- GitLab From 4b484584141a9b724034f94d6985daf9097e919e Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Fri, 13 Sep 2024 14:08:28 +0200 Subject: [PATCH 4/5] Setup from for mock server and robot dockerfile --- services/mock_server/Dockerfile | 2 +- tools/robot/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/mock_server/Dockerfile b/services/mock_server/Dockerfile index 6d72bf5..541395d 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/tools/robot/Dockerfile b/tools/robot/Dockerfile index a94c4b2..a7e18f8 100644 --- a/tools/robot/Dockerfile +++ b/tools/robot/Dockerfile @@ -1,4 +1,4 @@ -FROM 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" -- GitLab From 8b205f8c938e6f2843b2435e5c08d41b9e19e0f8 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 16 Sep 2024 12:58:35 +0200 Subject: [PATCH 5/5] Setup release version on docker compose to image: v2.x.x-release --- services/docker-compose-capif.yml | 23 ++++++++++++----------- services/docker-compose-register.yml | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/services/docker-compose-capif.yml b/services/docker-compose-capif.yml index a43eae7..7d08526 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: labs.etsi.org:5050/ocf/capif/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: labs.etsi.org:5050/ocf/capif/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: labs.etsi.org:5050/ocf/capif/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: labs.etsi.org:5050/ocf/capif/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: labs.etsi.org:5050/ocf/capif/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: labs.etsi.org:5050/ocf/capif/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: labs.etsi.org:5050/ocf/capif/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: labs.etsi.org:5050/ocf/capif/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: labs.etsi.org:5050/ocf/capif/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: labs.etsi.org:5050/ocf/capif/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: labs.etsi.org:5050/ocf/capif/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-register.yml b/services/docker-compose-register.yml index 4092f5a..3e29bb6 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: labs.etsi.org:5050/ocf/capif/jwtauth:3.1.3 + image: labs.etsi.org:5050/ocf/capif/register:v2.x.x-release depends_on: - mongo_register -- GitLab