From 0317811c5885a1695decf6c27c4b1f8b9e409e35 Mon Sep 17 00:00:00 2001
From: Jorge Moratinos Salcines <jorge.moratinossalcines@telefonica.com>
Date: Mon, 24 Feb 2025 11:40:43 +0100
Subject: [PATCH 1/3] Setup new url for mongo, mongo-express and redis images

---
 services/docker-compose-capif.yml                 | 6 +++---
 services/docker-compose-register.yml              | 4 ++--
 tools/base_images_scripts/push_base_images_ocf.sh | 6 ++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/services/docker-compose-capif.yml b/services/docker-compose-capif.yml
index 8ed11c38..6b5a504c 100644
--- a/services/docker-compose-capif.yml
+++ b/services/docker-compose-capif.yml
@@ -1,6 +1,6 @@
 services:
   redis:
-    image: "redis:alpine"
+    image: "labs.etsi.org:5050/ocf/capif/redis:7.4.2-alpine"
     command: redis-server
     ports:
       - "6379:6379"
@@ -254,7 +254,7 @@ services:
       - nginx
 
   mongo:
-    image: mongo:6.0.2
+    image: labs.etsi.org:5050/ocf/capif/mongo:6.0.2
     logging:
       driver: 'none'
     restart: unless-stopped
@@ -263,7 +263,7 @@ services:
       MONGO_INITDB_ROOT_PASSWORD: example
   
   mongo-express:
-    image: mongo-express:1.0.0-alpha.4
+    image: labs.etsi.org:5050/ocf/capif/mongo-express:1.0.0-alpha.4
     logging:
       driver: 'none'
     restart: unless-stopped
diff --git a/services/docker-compose-register.yml b/services/docker-compose-register.yml
index 02599a32..4abed673 100644
--- a/services/docker-compose-register.yml
+++ b/services/docker-compose-register.yml
@@ -23,7 +23,7 @@ services:
        - mongo_register
 
   mongo_register:
-    image: mongo:6.0.2
+    image: labs.etsi.org:5050/ocf/capif/mongo:6.0.2
     logging:
       driver: 'none'
     restart: unless-stopped
@@ -32,7 +32,7 @@ services:
       MONGO_INITDB_ROOT_PASSWORD: example
 
   mongo_register_express:
-    image: mongo-express:1.0.0-alpha.4
+    image: labs.etsi.org:5050/ocf/capif/mongo-express:1.0.0-alpha.4
     logging:
       driver: 'none'
     restart: unless-stopped
diff --git a/tools/base_images_scripts/push_base_images_ocf.sh b/tools/base_images_scripts/push_base_images_ocf.sh
index 0407dae6..2a9d472e 100755
--- a/tools/base_images_scripts/push_base_images_ocf.sh
+++ b/tools/base_images_scripts/push_base_images_ocf.sh
@@ -7,8 +7,10 @@ PLATFORMS=("linux/arm64"
 BASIC_IMAGES=("python:3-slim-bullseye"
 "nginx:1.27.1"
 "vault:1.13.2"
-"ubuntu:20.04")
-
+"ubuntu:20.04"
+"redis:7.4.2-alpine"
+"mongo-express:1.0.0-alpha.4"
+"mongo:6.0.2")
 
 docker login labs.etsi.org:5050
 for basic_image in "${BASIC_IMAGES[@]}"; do
-- 
GitLab


From a97ab9abfaf0d3d218d0e22b8810afea3847bb25 Mon Sep 17 00:00:00 2001
From: Jorge Moratinos Salcines <jorge.moratinossalcines@telefonica.com>
Date: Mon, 24 Feb 2025 12:21:41 +0100
Subject: [PATCH 2/3] Check architecture script uploaded

---
 services/check_architecture.sh | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100755 services/check_architecture.sh

diff --git a/services/check_architecture.sh b/services/check_architecture.sh
new file mode 100755
index 00000000..0301b9b9
--- /dev/null
+++ b/services/check_architecture.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+IMAGES=$(docker images|grep -v "REPOSITORY"|awk '{ print $1 ":" $2 }')
+
+for i in $IMAGES; do
+  Architecture=$(docker inspect $i|grep Architecture|awk '{ print $2 }')
+
+  echo "Image $i with architecture $Architecture"
+done
-- 
GitLab


From f99991eceb29a16297deff15b707d47f03e2031e Mon Sep 17 00:00:00 2001
From: Jorge Moratinos Salcines <jorge.moratinossalcines@telefonica.com>
Date: Mon, 24 Feb 2025 13:44:48 +0100
Subject: [PATCH 3/3] add some log to check architecture

---
 services/check_architecture.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/check_architecture.sh b/services/check_architecture.sh
index 0301b9b9..62cf2e35 100755
--- a/services/check_architecture.sh
+++ b/services/check_architecture.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+echo "Checking all images architecture"
+
 IMAGES=$(docker images|grep -v "REPOSITORY"|awk '{ print $1 ":" $2 }')
 
 for i in $IMAGES; do
-- 
GitLab