Commit 41f6a72a authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Updated nginx dockerfile to new nginx-ocf-custom image at etsi and script tool to update it updated

parent c60f98fd

services/nginx/Dockerfile

+1 −8
Changes for services/nginx/Dockerfile: 1 added line, 8 removed lines.
Original line number Diff line number Diff line 
FROM labs.etsi.org:5050/ocf/capif/nginx-ocf-patched:1.27.1

RUN echo "deb http://archive.debian.org/debian bullseye main" > /etc/apt/sources.list \

    && rm -f /etc/apt/sources.list.d/*

RUN apt-get update && apt-get install -y jq && apt-get clean

RUN apt-get install -y openssl

RUN apt-get install -y curl

RUN apt-get -y install redis



FROM labs.etsi.org:5050/ocf/capif/nginx-ocf-custom:1.27.1



RUN mkdir -p /etc/nginx/certs

tools/base_images_scripts/create_nginx_patched_images.sh

+4 −3
Changes for tools/base_images_scripts/create_nginx_patched_images.sh: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -7,13 +7,14 @@ PLATFORMS=("linux/arm64" 
"linux/amd64")

PATCH_REPO="https://labs.etsi.org/rep/ocf/tools/nginx-sslkeylog.git"

REGISTRY="labs.etsi.org:5050/ocf/capif"

DEBIAN_IMAGE="debian:bookworm"



MANIFEST_AMEND=""

for platform in "${PLATFORMS[@]}";do

  image_name="nginx-ocf-patched:$NGINX_VERSION"

  echo "$image_name pulled for platform $platform"

  image_name="nginx-ocf-custom:$NGINX_VERSION"

  echo "Creating and building $image_name for platform $platform"



  container_id=$(docker run -d --platform=$platform --name build-nginx debian:bullseye sleep infinity)

  container_id=$(docker run -d --platform=$platform --name build-nginx $DEBIAN_IMAGE sleep infinity)



  docker exec $container_id bash -c "

    set -e