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

feat(docker): configure fastapi's commit_hash based on $COMMIT_HASH

Browse source 
Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2021-10-25 15:38:51 -07:00
parent b49b629395
commit 8239dcdd1b
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
4 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.env
View file

@ -6,3 +6,4 @@ AURWEB_FASTAPI_PREFIX=https://localhost:8444
AURWEB_SSHD_PREFIX=ssh://aur@localhost:2222 AURWEB_SSHD_PREFIX=ssh://aur@localhost:2222
GIT_DATA_DIR="./aur.git/" GIT_DATA_DIR="./aur.git/"
TEST_RECURSION_LIMIT=10000 TEST_RECURSION_LIMIT=10000
COMMIT_HASH=

1
.gitlab-ci.yml
View file

@ -55,6 +55,7 @@ deploy:
AURWEB_PHP_PREFIX: https://aur-dev.archlinux.org AURWEB_PHP_PREFIX: https://aur-dev.archlinux.org
AURWEB_FASTAPI_PREFIX: https://aur-dev.archlinux.org AURWEB_FASTAPI_PREFIX: https://aur-dev.archlinux.org
AURWEB_SSHD_PREFIX: ssh://aur@aur-dev.archlinux.org:2222 AURWEB_SSHD_PREFIX: ssh://aur@aur-dev.archlinux.org:2222
COMMIT_HASH: $CI_COMMIT_SHA
script: script:
- pacman -Syu --noconfirm docker-compose socat openssh - pacman -Syu --noconfirm docker-compose socat openssh
- chmod 600 ${SSH_KEY} - chmod 600 ${SSH_KEY}

1
docker-compose.aur-dev.yml
View file

@ -48,6 +48,7 @@ services:
fastapi: fastapi:
restart: always restart: always
environment: environment:
- COMMIT_HASH=$COMMIT_HASH
- FASTAPI_BACKEND="gunicorn" - FASTAPI_BACKEND="gunicorn"
- FASTAPI_WORKERS=${FASTAPI_WORKERS} - FASTAPI_WORKERS=${FASTAPI_WORKERS}
- AURWEB_FASTAPI_PREFIX=${AURWEB_FASTAPI_PREFIX} - AURWEB_FASTAPI_PREFIX=${AURWEB_FASTAPI_PREFIX}

4
docker/fastapi-entrypoint.sh
View file

@ -11,6 +11,10 @@ sed -ri "s;^(aur_location) = .+;\1 = ${AURWEB_FASTAPI_PREFIX};" conf/config
sed -ri 's/^(cache) = .+/\1 = redis/' conf/config sed -ri 's/^(cache) = .+/\1 = redis/' conf/config
sed -ri 's|^(redis_address) = .+|\1 = redis://redis|' conf/config sed -ri 's|^(redis_address) = .+|\1 = redis://redis|' conf/config
if [ "$COMMIT_HASH" ]; then
sed -ri "s/^;?(commit_hash) =.*$/\1 = $COMMIT_HASH/" conf/config
fi
sed -ri "s|^(git_clone_uri_anon) = .+|\1 = ${AURWEB_FASTAPI_PREFIX}/%s.git|" conf/config.defaults sed -ri "s|^(git_clone_uri_anon) = .+|\1 = ${AURWEB_FASTAPI_PREFIX}/%s.git|" conf/config.defaults
sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ${AURWEB_SSHD_PREFIX}/%s.git|" conf/config.defaults sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ${AURWEB_SSHD_PREFIX}/%s.git|" conf/config.defaults