ADD django_sp in Docker-compose and revisited CI workflow

.dockerignore

@@ -2,6 +2,7 @@
 *
 # Add exception for the directories you actually want to include in the context
 !example
+!example_sp
 !requirements.txt
 !oids.conf
 !build_spid_certs.sh

.github/workflows/python-app.yml

@@ -26,29 +26,20 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install system dependencies
-      run: |
-        sudo apt update
-        sudo apt install -y libffi-dev libssl-dev python3-pip xmlsec1 procps libpcre3 libpcre3-dev
     - name: Install dependencies
       run: |
-        if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-        pip install -r example_sp/djangosaml2_sp/requirements.txt
         pip install spid-sp-test>=1.2.8
         pip install flake8
-        pip install satosa_oidcop>=1.0
     - name: Lint with flake8
       run: |
         ## stop the build if there are Python syntax errors or undefined names
         flake8 --count --select=E9,F63,F7,F82 --show-source --statistics example
         ## exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
         flake8 --max-line-length 120 --count --exit-zero --statistics example
-    - name: run djangosaml2 SP
-      run: |
-        cd example_sp/djangosaml2_sp/
-        bash run.sh &
-        sleep 5
+    - name: docker compose
+      run: |       
+        cd Docker-compose
+        docker compose -f docker-compose.yml up -d    
     - name: djangosaml2 SP metadata to Proxy
       run: |
         wget http://localhost:8000/saml2/metadata -O example/metadata/sp/djangosaml2_sp.xml
@@ -61,10 +52,6 @@ jobs:
         cd docker-example
         mkdir -p metadata/idp
         mkdir -p metadata/sp
-    - name: docker compose
-      run: |       
-        cd Docker-compose
-        docker compose -f docker-compose.yml up -d
     - name: Metadata proxy to djangosaml2 SP
       run: |
         wget --no-check-certificate https://localhost/Saml2IDP/metadata -O example_sp/djangosaml2_sp/saml2_sp/saml2_config/satosa-saml2spid.xml

Docker-compose/docker-compose.yml

@@ -35,8 +35,12 @@ services:
 
   satosa-saml2spid:
     #image: ghcr.io/italia/satosa-saml2spid:latest
-    image: satosa-saml2spid:latest
-    build: ../
+    #image: satosa-saml2spid:latest
+    build: 
+        context: ../      
+        args: 
+            - NODE_ENV=local        
+        dockerfile: satosa.Dockerfile
     container_name: satosa-saml2spid
     depends_on:
       - satosa-mongo
@@ -109,6 +113,26 @@ services:
     networks:
       - satosa-saml2spid
 
+
+  django_sp:
+    build: 
+        context: ../      
+        args: 
+            - NODE_ENV=local        
+        dockerfile: example_sp/django.Dockerfile
+    container_name: django_sp
+    #restart: always
+    working_dir: /django_sp
+    entrypoint: "sh ./entrypoint.sh"
+    volumes:
+       - /usr/share/zoneinfo/Europe/Rome:/etc/localtime:ro
+       - ../example_sp:/django_sp:rw
+    ports:
+      - "8000:8000"
+    networks:
+      - satosa-saml2spid    
+
+
   spid-samlcheck:
     image: italia/spid-saml-check
     container_name: spid-samlcheck

example_sp/django.Dockerfile

@@ -0,0 +1,19 @@
+FROM alpine:3.18
+ENV BASEDIR="/django_sp"
+RUN apk update
+RUN apk add --update --no-cache tzdata
+RUN cp /usr/share/zoneinfo/Europe/Rome /etc/localtime
+RUN echo "Europe/Rome" > /etc/timezone
+RUN apk del tzdata
+
+COPY djangosaml2_sp/requirements.txt /
+
+
+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 \
+&& pip3 install virtualenv
+
+RUN pip list
+WORKDIR $BASEDIR/
+
+RUN pip3 install -r ../requirements.txt --ignore-installed --root-user-action=ignore

example_sp/entrypoint.sh

@@ -0,0 +1,3 @@
+pip3 install -r ../requirements.txt --ignore-installed --root-user-action=ignore
+cd djangosaml2_sp
+python -B ./manage.py runserver 0.0.0.0:8000