From c401be5907ff7db741ffdccb0aefd45c70887887 Mon Sep 17 00:00:00 2001 From: Julien LEICHER Date: Fri, 27 Jun 2025 14:21:19 +0200 Subject: [PATCH] fix: environment variables names in compose --- 6.x/Asqatasun-MariaDB/.env | 4 ++-- 6.x/Asqatasun-MariaDB/README.md | 2 ++ 6.x/Asqatasun-MariaDB/docker-compose.yml | 11 ++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/6.x/Asqatasun-MariaDB/.env b/6.x/Asqatasun-MariaDB/.env index 83fa6b8..3b3e9f6 100644 --- a/6.x/Asqatasun-MariaDB/.env +++ b/6.x/Asqatasun-MariaDB/.env @@ -1,7 +1,7 @@ # Asqatasun global variables # ############################################################################## -ASQA_VERSION: "6.0.0-beta.1" +ASQA_VERSION: "6.0.0-rc.2" # Asqatasun *Server* variables # ############################################################################## @@ -54,7 +54,7 @@ DB_HOST_PORT: 3307 # ############################################################################## # Selenium Firefox version -SELENIUM_FF_VERSION: "4.18.1" +SELENIUM_FF_VERSION: "4.25.0" # Selenium grid URL SELENIUM_HUB_URL: "http://selenium-firefox-standalone:4444" diff --git a/6.x/Asqatasun-MariaDB/README.md b/6.x/Asqatasun-MariaDB/README.md index 0048685..8bf908e 100644 --- a/6.x/Asqatasun-MariaDB/README.md +++ b/6.x/Asqatasun-MariaDB/README.md @@ -6,6 +6,8 @@ docker compose up ``` +> Default account: admin@asqatasun.org / myAsqaPassword + ## Stop ```shell diff --git a/6.x/Asqatasun-MariaDB/docker-compose.yml b/6.x/Asqatasun-MariaDB/docker-compose.yml index 0042d91..118f71f 100644 --- a/6.x/Asqatasun-MariaDB/docker-compose.yml +++ b/6.x/Asqatasun-MariaDB/docker-compose.yml @@ -1,5 +1,4 @@ services: - db: image: "${DB_IMAGE}" environment: @@ -20,9 +19,9 @@ services: environment: JDBC_USER: "${JDBC_USER}" JDBC_PASSWORD: "${JDBC_PASSWORD}" - SELENIUM_HUB_URL: "${SELENIUM_HUB_URL}" + APP_ENGINE_LOADER_SELENIUM_HUBURL: "${SELENIUM_HUB_URL}" JDBC_URL: "${JDBC_URL}" - ASQA_SERVER_PORT: "${ASQA_SERVER_PORT}" + SERVER_PORT: "${ASQA_SERVER_PORT}" ports: - "${SERVER_HOST_IP}:${SERVER_HOST_PORT}:${ASQA_SERVER_PORT}" @@ -35,9 +34,11 @@ services: environment: JDBC_USER: "${JDBC_USER}" JDBC_PASSWORD: "${JDBC_PASSWORD}" - SELENIUM_HUB_URL: "${SELENIUM_HUB_URL}" + APP_ENGINE_LOADER_SELENIUM_HUBURL: "${SELENIUM_HUB_URL}" JDBC_URL: "${JDBC_URL}" - ASQA_WEBAPP_PORT: "${ASQA_WEBAPP_PORT}" + SERVER_PORT: "${ASQA_WEBAPP_PORT}" + APP_EMAILSENDER_SMTP_HOST: mailhog + APP_EMAILSENDER_SMTP_PORT: 1025 ports: - "${APP_HOST_IP}:${APP_HOST_PORT}:${ASQA_WEBAPP_PORT}" -- GitLab