external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(docker): fix cgit clone-prefix

Browse source 
Additionally, clone-prefix is now configurable via environment variables:

- CGIT_CLONE_PREFIX_PHP
- CGIT_CLONE_PREFIX_FASTAPI

These vars can be used by production to customize the clone prefix.

Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2021-10-20 17:31:52 -07:00
parent c4163547f6
commit db730ad8cb
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.env
View file

@ -1,3 +1,5 @@
FASTAPI_BACKEND="uvicorn" FASTAPI_BACKEND="uvicorn"
FASTAPI_WORKERS=2 FASTAPI_WORKERS=2
MARIADB_SOCKET_DIR="/var/run/mysqld/" MARIADB_SOCKET_DIR="/var/run/mysqld/"
CGIT_CLONE_PREFIX_PHP=https://localhost:8443
CGIT_CLONE_PREFIX_FASTAPI=https://localhost:8444

6
docker-compose.yml
View file

@ -88,8 +88,9 @@ services:
init: true init: true
environment: environment:
- AUR_CONFIG=/aurweb/conf/config - AUR_CONFIG=/aurweb/conf/config
- CGIT_CLONE_PREFIX=$CGIT_CLONE_PREFIX_PHP
entrypoint: /docker/cgit-entrypoint.sh entrypoint: /docker/cgit-entrypoint.sh
command: /docker/scripts/run-cgit.sh 3000 "https://localhost:8443/cgit" command: /docker/scripts/run-cgit.sh 3000
healthcheck: healthcheck:
test: "bash /docker/health/cgit.sh 3000" test: "bash /docker/health/cgit.sh 3000"
depends_on: depends_on:
@ -103,8 +104,9 @@ services:
init: true init: true
environment: environment:
- AUR_CONFIG=/aurweb/conf/config - AUR_CONFIG=/aurweb/conf/config
- CGIT_CLONE_PREFIX=$CGIT_CLONE_PREFIX_FASTAPI
entrypoint: /docker/cgit-entrypoint.sh entrypoint: /docker/cgit-entrypoint.sh
command: /docker/scripts/run-cgit.sh 3000 "https://localhost:8444/cgit" command: /docker/scripts/run-cgit.sh 3000
healthcheck: healthcheck:
test: "bash /docker/health/cgit.sh 3000" test: "bash /docker/health/cgit.sh 3000"
depends_on: depends_on:

2
docker/cgit-entrypoint.sh
View file

@ -4,7 +4,7 @@ set -eou pipefail
mkdir -p /var/cache/cgit mkdir -p /var/cache/cgit
cp -vf conf/cgitrc.proto /etc/cgitrc 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|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|footer=.*|footer=/aurweb/web/template/cgit/footer.html|' /etc/cgitrc
sed -ri 's|repo\.path=.*|repo.path=/aurweb/aur.git|' /etc/cgitrc sed -ri 's|repo\.path=.*|repo.path=/aurweb/aur.git|' /etc/cgitrc