From a07e5a8bb8d4b73678d42a5bbdeca704fcb747b5 Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Mon, 27 May 2024 17:38:54 +0800 Subject: [PATCH] consistent use of maps for docker-compose environment --- actions-services.yml | 64 ++++++++++++++++++++++---------------------- docker-compose.yml | 62 +++++++++++++++++++++--------------------- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/actions-services.yml b/actions-services.yml index e3b6b5df..523e0ded 100644 --- a/actions-services.yml +++ b/actions-services.yml @@ -23,15 +23,15 @@ services: - pwmanager.local - test-browser environment: - - MYSQL_HOST=db - - MYSQL_DATABASE=silauth - - MYSQL_USER=silauth - - MYSQL_PASSWORD=silauth - - PROFILE_URL_FOR_TESTS=http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub - - ADMIN_EMAIL=john_doe@there.com - - ADMIN_PASS=b - - SECRET_SALT=abc123 - - IDP_NAME=x + MYSQL_HOST: db + MYSQL_DATABASE: silauth + MYSQL_USER: silauth + MYSQL_PASSWORD: silauth + PROFILE_URL_FOR_TESTS: http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub + ADMIN_EMAIL: john_doe@there.com + ADMIN_PASS: b + SECRET_SALT: abc123 + IDP_NAME: x volumes: - ./dockerbuild/run-integration-tests.sh:/data/run-integration-tests.sh - ./dockerbuild/run-metadata-tests.sh:/data/run-metadata-tests.sh @@ -210,13 +210,13 @@ services: - ./development/sp2-local/metadata/saml20-idp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php environment: - - ADMIN_EMAIL=john_doe@there.com - - ADMIN_PASS=sp2 - - SECRET_SALT=h57fjemb&dn^nsJFGNjweJz2 - - SECURE_COOKIE=false - - SHOW_SAML_ERRORS=true - - SAML20_IDP_ENABLE=false - - ADMIN_PROTECT_INDEX_PAGE=false + ADMIN_EMAIL: john_doe@there.com + ADMIN_PASS: sp2 + SECRET_SALT: h57fjemb&dn^nsJFGNjweJz2 + SECURE_COOKIE: false + SHOW_SAML_ERRORS: true + SAML20_IDP_ENABLE: false + ADMIN_PROTECT_INDEX_PAGE: false ssp-sp3.local: build: . @@ -232,13 +232,13 @@ services: - ./development/sp3-local/metadata/saml20-idp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php environment: - - ADMIN_EMAIL=john_doe@there.com - - ADMIN_PASS=sp3 - - SECRET_SALT=h57fjemb&dn^nsJFGNjweJz3 - - SECURE_COOKIE=false - - SHOW_SAML_ERRORS=true - - SAML20_IDP_ENABLE=false - - ADMIN_PROTECT_INDEX_PAGE=false + ADMIN_EMAIL: john_doe@there.com + ADMIN_PASS: sp3 + SECRET_SALT: h57fjemb&dn^nsJFGNjweJz3 + SECURE_COOKIE: false + SHOW_SAML_ERRORS: true + SAML20_IDP_ENABLE: false + ADMIN_PROTECT_INDEX_PAGE: false pwmanager.local: @@ -253,15 +253,15 @@ services: # Utilize custom metadata - ./development/sp-local/metadata/saml20-idp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php environment: - - ADMIN_EMAIL=john_doe@there.com - - ADMIN_PASS=sp1 - - IDP_NAME=THIS VARIABLE IS REQUIRED BUT PROBABLY NOT USED - - SECRET_SALT=NOT-a-secret-k49fjfkw73hjf9t87wjiw - - SECURE_COOKIE=false - - SHOW_SAML_ERRORS=true - - SAML20_IDP_ENABLE=false - - ADMIN_PROTECT_INDEX_PAGE=false - - THEME_USE=default + ADMIN_EMAIL: john_doe@there.com + ADMIN_PASS: sp1 + IDP_NAME: THIS VARIABLE IS REQUIRED BUT PROBABLY NOT USED + SECRET_SALT: NOT-a-secret-k49fjfkw73hjf9t87wjiw + SECURE_COOKIE: false + SHOW_SAML_ERRORS: true + SAML20_IDP_ENABLE: false + ADMIN_PROTECT_INDEX_PAGE: false + THEME_USE: default # the broker and brokerDb containers are used by the silauth module broker: diff --git a/docker-compose.yml b/docker-compose.yml index eb4939c3..c524326e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,16 +31,16 @@ services: - pwmanager.local - test-browser environment: - - MYSQL_HOST=db - - MYSQL_DATABASE=silauth - - MYSQL_USER=silauth - - MYSQL_PASSWORD=silauth - - COMPOSER_CACHE_DIR=/composer - - PROFILE_URL_FOR_TESTS=http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub - - ADMIN_EMAIL=john_doe@there.com - - ADMIN_PASS=b - - SECRET_SALT=abc123 - - IDP_NAME=x + MYSQL_HOST: db + MYSQL_DATABASE: silauth + MYSQL_USER: silauth + MYSQL_PASSWORD: silauth + COMPOSER_CACHE_DIR: /composer + PROFILE_URL_FOR_TESTS: http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub + ADMIN_EMAIL: john_doe@there.com + ADMIN_PASS: b + SECRET_SALT: abc123 + IDP_NAME: x volumes: - ./composer.json:/data/composer.json - ./composer.lock:/data/composer.lock @@ -79,7 +79,7 @@ services: env_file: - ./local.env environment: - - COMPOSER_CACHE_DIR=/composer + COMPOSER_CACHE_DIR: /composer ssp-hub.local: build: . @@ -342,13 +342,13 @@ services: env_file: - local.env environment: - - ADMIN_EMAIL=john_doe@there.com - - ADMIN_PASS=sp3 - - SECRET_SALT=h57fjemb&dn^nsJFGNjweJz3 - - SECURE_COOKIE=false - - SHOW_SAML_ERRORS=true - - SAML20_IDP_ENABLE=false - - ADMIN_PROTECT_INDEX_PAGE=false + ADMIN_EMAIL: john_doe@there.com + ADMIN_PASS: sp3 + SECRET_SALT: h57fjemb&dn^nsJFGNjweJz3 + SECURE_COOKIE: false + SHOW_SAML_ERRORS: true + SAML20_IDP_ENABLE: false + ADMIN_PROTECT_INDEX_PAGE: false pwmanager.local: image: silintl/ssp-base:develop @@ -364,15 +364,15 @@ services: ports: - "8084:80" environment: - - ADMIN_EMAIL=john_doe@there.com - - ADMIN_PASS=sp1 - - IDP_NAME=THIS VARIABLE IS REQUIRED BUT PROBABLY NOT USED - - SECRET_SALT=NOT-a-secret-k49fjfkw73hjf9t87wjiw - - SECURE_COOKIE=false - - SHOW_SAML_ERRORS=true - - SAML20_IDP_ENABLE=false - - ADMIN_PROTECT_INDEX_PAGE=false - - THEME_USE=default + ADMIN_EMAIL: john_doe@there.com + ADMIN_PASS: sp1 + IDP_NAME: THIS VARIABLE IS REQUIRED BUT PROBABLY NOT USED + SECRET_SALT: NOT-a-secret-k49fjfkw73hjf9t87wjiw + SECURE_COOKIE: false + SHOW_SAML_ERRORS: true + SAML20_IDP_ENABLE: false + ADMIN_PROTECT_INDEX_PAGE: false + THEME_USE: material:material # the broker and brokerDb containers are used by the silauth module broker: @@ -429,10 +429,10 @@ services: depends_on: - dynamo environment: - - AWS_ACCESS_KEY_ID=0 - - AWS_SECRET_ACCESS_KEY=0 - - AWS_DEFAULT_REGION=us-east-1 - - AWS_DYNAMODB_ENDPOINT=http://dynamo:8000 + AWS_ACCESS_KEY_ID: 0 + AWS_SECRET_ACCESS_KEY: 0 + AWS_DEFAULT_REGION: us-east-1 + AWS_DYNAMODB_ENDPOINT: http://dynamo:8000 node: image: node:lts-alpine