Skip to content

Commit

Permalink
fix: remove docker-example folder usage
Browse files Browse the repository at this point in the history
Remove `docker-example` and use `example`.
  • Loading branch information
Salvatore Laiso committed Feb 1, 2024
1 parent 267ff8d commit c81db2c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 13 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ jobs:
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: Create docker-example folder
run: |
mkdir -p docker-example
cp -r example/. docker-example
- name: docker compose
run: |
cd Docker-compose
Expand All @@ -52,22 +48,22 @@ jobs:
wget http://localhost:8000/saml2/metadata -O example/metadata/sp/djangosaml2_sp.xml
- name: run satosa-saml2spid
run: |
cd docker-example
cd example
mkdir -p metadata/idp
mkdir -p metadata/sp
- 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
- name: spid-sp-test SPID metadata, requests and responses
run: |
cd docker-example
cd example
spid_sp_test --idp-metadata > metadata/idp/spid-sp-test.xml
spid_sp_test --metadata-url https://localhost/spidSaml2/metadata --authn-url "http://localhost:8000/saml2/login/?idp=https://localhost/Saml2IDP/metadata&next=/saml2/echo_attributes&idphint=https%253A%252F%252Flocalhost%253A8080" -ap spid_sp_test.plugins.authn_request.SatosaSaml2Spid --extra --debug ERROR -tr
- name: spid-sp-test CIE id metadata
run: |
cd docker-example
cd example
spid_sp_test --profile cie-sp-public --metadata-url https://localhost/cieSaml2/metadata
- name: spid-sp-test eIDAS FiCEP metadata
run: |
cd docker-example
cd example
spid_sp_test --profile ficep-eidas-sp --metadata-url https://localhost/spidSaml2/metadata
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ example/private/*
*pyFF_example/entities
example_sp/djangosaml2_sp/sqlite3.db
project/*
docker-example/*
satosa-saml2spid.pid
2 changes: 0 additions & 2 deletions Docker-compose/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ For docker-compose you can also [see here](https://docs.docker.com/compose/insta

## Run the composition

Copy the folder `example` to `docker-example` and do your configuration.

### Start the Compose

Execute the run script for the first time:
Expand Down
4 changes: 2 additions & 2 deletions Docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ services:
- "10000:10000"
volumes:
- /usr/share/zoneinfo/Europe/Rome:/etc/localtime:ro
- ../docker-example:/satosa_proxy:rw
- ../example:/satosa_proxy:rw
working_dir: /satosa_proxy
entrypoint: "sh entrypoint.sh"
networks:
Expand All @@ -138,7 +138,7 @@ services:
- ./nginx/404.html:/usr/share/nginx/html/404.html:ro
- ./nginx/403.html:/usr/share/nginx/html/403.html:ro
- nginx_certs:/etc/nginx/certs:ro
- ../docker-example/static:/var/www/html
- ../example/static:/var/www/html
networks:
- satosa-saml2spid

Expand Down

0 comments on commit c81db2c

Please sign in to comment.