Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update base image #117

Closed
wants to merge 49 commits into from
Closed

Update base image #117

wants to merge 49 commits into from

Conversation

salvatorelaiso
Copy link
Collaborator

  • Update Satosa base image from alpine:3.18 to alpine:3.19.1.
  • Update Django example base image from alpine:3.18 to alpine:3.19.1.

Both images now install python packages into a dedicated virtual environment, solving the error raised by Alpine:

The system-wide python installation should be maintained using the system
package manager (apk) only.

Fixes #110
Fixes #111

peppelinux and others added 30 commits July 21, 2023 12:01
@peppelinux
pyeudiw conf
720b6e3
@peppelinux
fix: discovery page and entity configuration endpoint
eca8166
@peppelinux
fix: openid4vp backend base_url
97feb84
@peppelinux
feat: qrcode templates
3be2e8e
@peppelinux
chore: openid4vp backend example conf
6c8ecb2
@peppelinux
feat: added mongodb in pyeudiw backend conf
ab742d5
@peppelinux
feat: aligne pyeudiw backend conf
3d1b93a
@peppelinux
chore: alignment of openid4vp backend example with pyeudiw dev branch
38f6aa4
@peppelinux
chore: pyeudiw backend example update
dc9629b
@peppelinux
aligned pyeudiw backend assets
9567b77
@peppelinux
fix: pyeudiw v0.5.0 alignments
e7d5bd1
uwsgi setup nginx and spid idps js
2536386
@peppelinux
chore: uwsgi examples init scripts and nginx improvements
186001f
feat: nginx hardening
15cc23b
@peppelinux
eudi small alignments
dee8a04
@peppelinux
Merge branch 'eudi' of https://github.com/italia/satosa-saml2spid int…
2ba1bd3 
…o eudi
@peppelinux
uwsgi not truncating long debug messages
ed02089
@AlessioMurru @MdreW @Gartic99
Docker revamping (italia#90)
766930c 
* python version selected dinamically for docker version

* fixed python version

* added enviroments description

* fix enviroment's name and echo

* fir doker-compose and readme files

* fix: change library from libressl-dev to openssl-dev

* Update target_based_routing.yaml

Fixed ficep entity_id name

* New ficep metadata

* chore: added dependency for django theme

* Fix: remove of non existing field of user

* feat: implemented Django template for the example sp

* chore: example project - disco, proxy_conf and README

* chore: README

* chore: README added CORSO IDEM Proxy

* fix: Docker compose

* fix: Docker compose - README

* fix: Docker compose - README

* pyff folder renamed

* Docker revamp

* Docker revamp

* chore: created static folder with static files

* fix: adding missing STATIC_ROOT

* fix: using {% static %} for static resources

* fix: removed unused code

* Update example_sp/djangosaml2_sp/saml2_sp/views.py

Co-authored-by: Giuseppe De Marco <[email protected]>

* Update example_sp/djangosaml2_sp/saml2_sp/views.py

Co-authored-by: Giuseppe De Marco <[email protected]>

* Docker revamp

* fix: Docker entrypoint

* chore: README

* chore: README

* fix: docker compose

---------

Co-authored-by: Alessio Murru <[email protected]>
Co-authored-by: MDreW <[email protected]>
Co-authored-by: Gartic99 <[email protected]>
Co-authored-by: Ghenadie Artic <[email protected]>
@peppelinux
fix: compose and and idp button
6072f53
@peppelinux
fix: spid backend target routing
84c3e7e
@peppelinux
chore: spid-saml-check animated gif
ffe9067
@peppelinux
fix: general configuration and documentation
75dfbed
@peppelinux
Merge branch 'master' of https://github.com/italia/Satosa-Saml2Spid i…
9ccced7 
…nto eudi
@Gartic99
Feat: by clicking on my name, you have a dropdown (italia#93)
5d24cf0 
* chore: added dependency for django theme

* Fix: remove of non existing field of user

* feat: implemented Django template for the example sp

* chore: created static folder with static files

* fix: adding missing STATIC_ROOT

* fix: using {% static %} for static resources

* fix: removed unused code

* Update example_sp/djangosaml2_sp/saml2_sp/views.py

Co-authored-by: Giuseppe De Marco <[email protected]>

* Update example_sp/djangosaml2_sp/saml2_sp/views.py

Co-authored-by: Giuseppe De Marco <[email protected]>

* feat: dropdown for profile

* fix: resolved merge conflicts

---------

Co-authored-by: Giuseppe De Marco <[email protected]>
@Gartic99 @MdreW
Merged PR italia#81 into EUDI (italia#94)
a70e6c2 
* new discovery and error page based on bootstrap-itali v2.6.1

* added id and class for errors

* chore: added dependency for django theme

* Fix: remove of non existing field of user

* feat: implemented Django template for the example sp

* chore: created static folder with static files

* fix: adding missing STATIC_ROOT

* fix: using {% static %} for static resources

* fix: removed unused code

* Update example_sp/djangosaml2_sp/saml2_sp/views.py

Co-authored-by: Giuseppe De Marco <[email protected]>

* Update example_sp/djangosaml2_sp/saml2_sp/views.py

Co-authored-by: Giuseppe De Marco <[email protected]>

* feat: dropdown for profile

* fix: resolved merge conflicts

* chore: removed comments on disco.html file

* feat: improved echo_attributes page

* Update Docker-compose/docker-compose.yml

Co-authored-by: Giuseppe De Marco <[email protected]>

---------

Co-authored-by: MDreW <[email protected]>
Co-authored-by: Giuseppe De Marco <[email protected]>
@davidelongo-ey
Satosa-Saml2Spid/Eudi - Readme Review for initial setup of the enviro…
d10df79 
…nment (italia#95)

* Modifica Readme Satosa-Saml2Spid

* aggiornamento django Readme

* aggiornamento  Readme

* Update readme - second release

* update - review readme

* create new Readme about DEMO SAML2 SP + remove blanck lines + modified django readme

* Apply suggestions from code review

---------

Co-authored-by: Giuseppe De Marco <[email protected]>
ci: only py3.10 since it will be tested using docker
4135d61
@peppelinux
fix: djangosaml2 example sp templates and conf
74e976d
@peppelinux
chore: README wallet demo
e3ca116
@peppelinux
Merge branch 'eudi' of https://github.com/italia/Satosa-Saml2Spid int…
0d6f53b 
…o eudi
peppelinux and others added 18 commits December 5, 2023 10:33
@peppelinux
chore: updated discovery page image
f790fe8
@peppelinux
chore: updated discovery page image
76c65d6
@peppelinux
chore: README editorials
682590c
@peppelinux
fix: wallet demo animated gif dimensions
691193a
@peppelinux
fix: wallet demo animated gif dimensions
24a585b
@peppelinux
fix: sumamry
5a843f4
@davidelongo-ey
update CI workflow (Revision 1) (italia#96)
d03c902 
* update CI workflow (Revision 1)

* remove pip install line 35

* Update CI workflow -  revision 2
@davidelongo-ey
ADD django_sp in Docker-compose and revisited CI workflow (italia#97)
4ad448e 
* Update CI workflow + ADD django_sp in Docker-compose

* Update CI Workflow - Review 2

* Update CI Workflow - Review 2.1

* Update CI Workflow - Review 2.2

* Update CI workflow + Docker-compose (review 3.1)
@Gartic99 @MdreW
feat: qrcode loaded by client (italia#98)
9bf36a2 
* new discovery and error page based on bootstrap-itali v2.6.1

* added id and class for errors

* chore: added dependency for django theme

* Fix: remove of non existing field of user

* feat: implemented Django template for the example sp

* chore: created static folder with static files

* fix: adding missing STATIC_ROOT

* fix: using {% static %} for static resources

* fix: removed unused code

* Update example_sp/djangosaml2_sp/saml2_sp/views.py

Co-authored-by: Giuseppe De Marco <[email protected]>

* Update example_sp/djangosaml2_sp/saml2_sp/views.py

Co-authored-by: Giuseppe De Marco <[email protected]>

* feat: dropdown for profile

* fix: resolved merge conflicts

* chore: removed comments on disco.html file

* feat: improved echo_attributes page

* feat: qrcode loaded by js library

* fix: qrcode_color set by parameter

---------

Co-authored-by: MDreW <[email protected]>
Co-authored-by: Giuseppe De Marco <[email protected]>
@salvatorelaiso
Remove apply_conf.sh script (italia#103)
c9a9b54 
* fix: remove `apply_conf.sh` script and use ENV vars instead

* fix: remove `apply_conf.sh` script and use ENV vars instead

* fix: delete `apply_conf.sh` file

* fix: separate `SATOSA_BASE_STATIC` from `SATOSA_BASE`

---------

Co-authored-by: Salvatore Laiso <[email protected]>
@davidelongo-ey
Add in "External references" readme section the reference of pyeudiw …
f1f4f29 
…doc (italia#104)

* Update CI workflow + ADD django_sp in Docker-compose

* Update CI Workflow - Review 2

* Update CI Workflow - Review 2.1

* Update CI Workflow - Review 2.2

* Update CI workflow + Docker-compose (review 3.1)

* issue italia#92 - add pyeudiw documentation ref

* issue italia#92 - add pyeudiw documentation ref (review)

* issue italia#92 - add pyeudiw documentation ref (review2)
Merge branch 'master' into eudi
851e899
@Gartic99
Fixes pre release 0.8.0 (italia#105)
396fc1f 
* fix: align pyeudiw yaml config file

* fix: align disco page to pyeudiw

* fix: align base html to pyeudiw

* fix: align qrcode to pyeudiw

* fix: change reference to correct bootstrap

* fix: add statics needed by spid_base

* doc: update Configuration by environment variables section
@salvatorelaiso
Fix CI pre-release (italia#107)
267ff8d 
* fix: github action

* fix: temporary retrieve `pyeudiw` from github repo

* fix: add `eudi` branch into CI triggers

* chore: linting and container status info

* fix: missing dependencies in CI host machine

* fix: wait container startup

* fix: add healthcheck

---------

Co-authored-by: Salvatore Laiso <[email protected]>
fix: healthcheck
995f62c
fix: revert pyeudiw to PyPI distributed one
f17340c
fix: update Satosa base to Alpine 3.19.1
1efc35f
fix: update Django base to Alpine 3.19.1
aa85cce
@peppelinux peppelinux requested a review from MdreW February 5, 2024 10:28
peppelinux
peppelinux reviewed Feb 5, 2024
View reviewed changes
example/uwsgi_setup/uwsgi/uwsgi.ini.docker Outdated
@@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@salvatorelaiso could you please check if is there any way to ref python version withing the uwsgi ini file?

I would like to avoid this constant about the python version used runtime

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@peppelinux what do you think about this: f454232 ?

@salvatorelaiso salvatorelaiso marked this pull request as draft February 6, 2024 14:32
@salvatorelaiso salvatorelaiso changed the base branch from eudi to master February 7, 2024 14:42
@salvatorelaiso salvatorelaiso mentioned this pull request Feb 7, 2024
Merged
@salvatorelaiso
Copy link
Collaborator Author

salvatorelaiso commented Feb 7, 2024 •
edited
Loading

Closing in favor of #120

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peppelinux peppelinux peppelinux left review comments

@MdreW MdreW Awaiting requested review from MdreW

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Base image of django_sp Base image of satosa-saml2spid dockerfile
4 participants
@salvatorelaiso @peppelinux @Gartic99 @davidelongo-ey