Update base image (#120)

* fix: update Satosa base to Alping 3.19.1

* fix: update Django base to Alpine 3.19.1

* fix: healthcheck

* fix: automatic package lib folder linking

---------

Co-authored-by: Salvatore Laiso <salvatore.laiso@it.ey.com>

Docker-compose/docker-compose.yml

@@ -118,11 +118,11 @@ services:
     networks:
       - satosa-saml2spid
     healthcheck:
-      test: curl --fail http://localhost/SAML2IDP/metadata || exit 1
-      interval: 2s
+      test: wget -O - https://satosa-nginx/Saml2IDP/metadata --no-check-certificate || exit 1
+      interval: 30s
       retries: 10
-      start_period: 10s
-      timeout: 10s
+      start_period: 30s
+      timeout: 30s
 
   satosa-nginx:
     image: nginx:alpine

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.19.1
 
 # Metadata params
 ARG BUILD_DATE
@@ -32,10 +32,12 @@ COPY requirements.txt /
 
 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 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 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
 

example/entrypoint.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+. /.venv/bin/activate
 
 # get IDEM MDQ key
 if [[ $GET_IDEM_MDQ_KEY == true ]]; then
@@ -7,4 +8,5 @@ if [[ $GET_IDEM_MDQ_KEY == true ]]; then
   echo "Downloaded IDEM MDQ key"
 fi
 
-uwsgi --ini /satosa_proxy/uwsgi_setup/uwsgi/uwsgi.ini.docker
+wsgi_file=/.venv/lib/$(python -c 'import sys; print(f"python{sys.version_info.major}.{sys.version_info.minor}")')/site-packages/satosa/wsgi.py
+uwsgi --ini /satosa_proxy/uwsgi_setup/uwsgi/uwsgi.ini.docker --wsgi-file $wsgi_file

example/uwsgi_setup/uwsgi/uwsgi.ini.docker

@@ -14,7 +14,6 @@ processes   = 8
 # sets max connections to
 listen = 2048
 
-wsgi-file   = /usr/lib/python3.11/site-packages/satosa/wsgi.py
 callable = app
 
 log-master-bufsize = 128000

example_sp/django.Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.19.1
 
 RUN apk update
 RUN apk add --update --no-cache tzdata
@@ -11,9 +11,7 @@ COPY example_sp/entrypoint.sh /
 
 WORKDIR /djangosaml2_sp
 
-RUN apk add --update xmlsec-dev 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
+RUN apk add --update xmlsec-dev libffi-dev openssl-dev python3 py3-pip python3-dev procps git openssl build-base gcc wget bash jq yq 
 
-RUN pip list
-
-RUN pip3 install -r ../requirements.txt --ignore-installed --root-user-action=ignore
+RUN python3 -m venv .venv && . .venv/bin/activate && pip3 install --upgrade pip setuptools \ 
+    && pip3 install -r ../requirements.txt --ignore-installed --root-user-action=ignore

example_sp/entrypoint.sh

@@ -1,2 +1,3 @@
+. /djangosaml2_sp/.venv/bin/activate
 python -B manage.py migrate
 python -B manage.py runserver 0.0.0.0:8000