Commit 3f5851e2 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Merge branch 'OCF121-setup-fixed-value-for-redis-on-docker-compose-file' into 'staging' 

Resolve "Setup fixed value for redis on docker-compose file"

Closes #121

See merge request !106
parents 1f1131f7 f99991ec

services/check_architecture.sh

0 → 100755
+11 −0
Original line number Diff line number Diff line 
#!/bin/bash



echo "Checking all images architecture"



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

services/docker-compose-capif.yml

+3 −3
Original line number Diff line number Diff line 
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

services/docker-compose-register.yml

+2 −2
Original line number Diff line number Diff line
@@ -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

tools/base_images_scripts/push_base_images_ocf.sh

+4 −2
Original line number Diff line number Diff line
@@ -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