From 1efc35fd89a8bd12f7abf27d8474004e860aafd5 Mon Sep 17 00:00:00 2001
From: Salvatore Laiso <salvatore.laiso@it.ey.com>
Date: Thu, 1 Feb 2024 12:58:16 +0100
Subject: [PATCH] fix: update Satosa base to Alpine 3.19.1

---
 example/entrypoint.sh                      |  1 +
 example/uwsgi_setup/uwsgi/uwsgi.ini.docker |  2 +-
 satosa.Dockerfile                          | 12 ++++++------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/example/entrypoint.sh b/example/entrypoint.sh
index a2b66792..d69c3514 100644
--- a/example/entrypoint.sh
+++ b/example/entrypoint.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+. /.venv/bin/activate
 
 # get IDEM MDQ key
 if [[ $GET_IDEM_MDQ_KEY == true ]]; then
diff --git a/example/uwsgi_setup/uwsgi/uwsgi.ini.docker b/example/uwsgi_setup/uwsgi/uwsgi.ini.docker
index 62f42205..d8e01964 100644
--- a/example/uwsgi_setup/uwsgi/uwsgi.ini.docker
+++ b/example/uwsgi_setup/uwsgi/uwsgi.ini.docker
@@ -14,7 +14,7 @@ processes   = 8
 # sets max connections to
 listen = 2048
 
-wsgi-file   = /usr/lib/python3.11/site-packages/satosa/wsgi.py
+wsgi-file   = /.venv/lib/python3.11/site-packages/satosa/wsgi.py
 callable = app
 
 log-master-bufsize = 128000
diff --git a/satosa.Dockerfile b/satosa.Dockerfile
index cc4f08c0..9d855281 100644
--- a/satosa.Dockerfile
+++ b/satosa.Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.19.1
 
 # Metadata params
 ARG BUILD_DATE
@@ -17,7 +17,7 @@ LABEL org.opencontainers.image.authors=$AUTHORS \
       org.opencontainers.image.source=$VCS_URL \
       org.opencontainers.image.revision=$VCS_REF \
       org.opencontainers.image.description="Docker Image di Satosa-Saml2Spid."
-      
+
 RUN apk update
 RUN apk add --update --no-cache tzdata
 RUN cp /usr/share/zoneinfo/Europe/Rome /etc/localtime
@@ -30,12 +30,12 @@ RUN apk add mailcap
 COPY requirements.txt /
 
 
+RUN apk add --update xmlsec libffi-dev openssl-dev python3 py3-pip python3-dev procps git openssl build-base gcc wget bash jq yq
+
 ENV BASEDIR="/satosa_proxy"
 
-RUN apk add --update xmlsec libffi-dev openssl-dev python3 py3-pip python3-dev procps git openssl build-base gcc wget bash jq yq \
- && pip3 install --upgrade pip setuptools --root-user-action=ignore \
- && pip3 install -r requirements.txt --ignore-installed --root-user-action=ignore \
- && mkdir $BASEDIR
+RUN python3 -m venv .venv && . .venv/bin/activate && pip3 install --upgrade pip setuptools \ 
+      && pip3 install -r requirements.txt --ignore-installed --root-user-action=ignore && mkdir $BASEDIR
 
 RUN pip list