Skip to content

Commit

Permalink
Docker: Add default config parameters in order to work with the other…
Browse files Browse the repository at this point in the history
… apps in the docker development environment
  • Loading branch information
quartje committed Aug 17, 2023
1 parent 192b22b commit abb3782
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
19 changes: 9 additions & 10 deletions config/legacy/parameters.yaml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,17 @@ parameters:
- en_GB

# SAML configuration
saml_idp_publickey: '%kernel.root_dir%/../vendor/surfnet/stepup-saml-bundle/src/Resources/keys/development_publickey.cer'
saml_idp_privatekey: '%kernel.root_dir%/../vendor/surfnet/stepup-saml-bundle/src/Resources/keys/development_privatekey.pem'
saml_metadata_publickey: '%kernel.root_dir%/../vendor/surfnet/stepup-saml-bundle/src/Resources/keys/development_publickey.cer'
saml_metadata_privatekey: '%kernel.root_dir%/../vendor/surfnet/stepup-saml-bundle/src/Resources/keys/development_privatekey.pem'
saml_remote_sp_entity_id: 'https://pieter.aai.surfnet.nl/simplesamlphp/module.php/saml/sp/metadata.php/default-sp'
saml_remote_sp_sso_url: '"https://pieter.aai.surfnet.nl/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp"'
saml_remote_sp_certificate: '%kernel.root_dir%/../vendor/surfnet/stepup-gssp-bundle/src/Resources/keys/pieter.aai.surfnet.nl.pem'
saml_remote_sp_acs: 'https://pieter.aai.surfnet.nl/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp'
saml_idp_publickey: '/config/tiqr/tiqr_idp.crt'
saml_idp_privatekey: '/config/tiqr/tiqr_idp.key'
saml_metadata_publickey: '/config/tiqr/tiqr_idp.crt'
saml_metadata_privatekey: '/config/tiqr/tiqr_idp.key'
saml_remote_sp_entity_id: 'https://gateway.dev.openconext.local/gssp/tiqr/metadata'
saml_remote_sp_certificate: '/config/gateway/gateway_gssp_sp.crt'
saml_remote_sp_acs: 'https://gateway.dev.openconext.local/gssp/tiqr/consume-assertion'

# Hosting settings (own URL)
base_url: 'https://tiqr.stepup.example.com'
tiqr_identity: 'tiqr.stepup.example.com'
base_url: 'https://tiqr.dev.openconext.local'
tiqr_identity: 'tiqr.dev.openconext.local'

# View parameters, 'en' entry was added as this is the default used by Translator. Was unable to configure it to
# use en_GB. TODO: look into configuring this the right way.
Expand Down
5 changes: 4 additions & 1 deletion docker/Dockerfile.prod
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2:latest AS php-build
COPY *.tar.bz2 /tmp/
RUN tar -xvjf /tmp/*.tar.bz2 -C /var/www/html/ && \
rm -rf /tmp/*.tar.bz2
rm -rf /tmp/*.tar.bz2

# Add the application configuration files
COPY config/legacy/parameters.yaml.dist config/legacy/parameters.yaml

# TIQR needs some assests to be installed
RUN bin/console assets:install

# Add the config files for Apache2
RUN rm -rf /etc/apache2/sites-enabled/*
COPY ./docker/conf/tiqr-apache2.conf /etc/apache2/sites-enabled/tiqr.conf
Expand Down

0 comments on commit abb3782

Please sign in to comment.