diff --git a/.env b/.env index 92b6bbd2..1162359f 100644 --- a/.env +++ b/.env @@ -1,3 +1,5 @@ FASTAPI_BACKEND="uvicorn" FASTAPI_WORKERS=2 MARIADB_SOCKET_DIR="/var/run/mysqld/" +CGIT_CLONE_PREFIX_PHP=https://localhost:8443 +CGIT_CLONE_PREFIX_FASTAPI=https://localhost:8444 diff --git a/docker-compose.yml b/docker-compose.yml index 3d1da263..7503bad3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -88,8 +88,9 @@ services: init: true environment: - AUR_CONFIG=/aurweb/conf/config + - CGIT_CLONE_PREFIX=$CGIT_CLONE_PREFIX_PHP entrypoint: /docker/cgit-entrypoint.sh - command: /docker/scripts/run-cgit.sh 3000 "https://localhost:8443/cgit" + command: /docker/scripts/run-cgit.sh 3000 healthcheck: test: "bash /docker/health/cgit.sh 3000" depends_on: @@ -103,8 +104,9 @@ services: init: true environment: - AUR_CONFIG=/aurweb/conf/config + - CGIT_CLONE_PREFIX=$CGIT_CLONE_PREFIX_FASTAPI entrypoint: /docker/cgit-entrypoint.sh - command: /docker/scripts/run-cgit.sh 3000 "https://localhost:8444/cgit" + command: /docker/scripts/run-cgit.sh 3000 healthcheck: test: "bash /docker/health/cgit.sh 3000" depends_on: diff --git a/docker/cgit-entrypoint.sh b/docker/cgit-entrypoint.sh index 9abc5091..3615ade5 100755 --- a/docker/cgit-entrypoint.sh +++ b/docker/cgit-entrypoint.sh @@ -4,7 +4,7 @@ set -eou pipefail mkdir -p /var/cache/cgit cp -vf conf/cgitrc.proto /etc/cgitrc -sed -ri "s|clone-prefix=.*|clone-prefix=${2}|" /etc/cgitrc +sed -ri "s|clone-prefix=.*|clone-prefix=${CGIT_CLONE_PREFIX}|" /etc/cgitrc sed -ri 's|header=.*|header=/aurweb/web/template/cgit/header.html|' /etc/cgitrc sed -ri 's|footer=.*|footer=/aurweb/web/template/cgit/footer.html|' /etc/cgitrc sed -ri 's|repo\.path=.*|repo.path=/aurweb/aur.git|' /etc/cgitrc