change(docker): merge production git repo bind mount

This merge requires production users to specify an host
directory to bind as the git repository within Docker containers.

This means that a repository can be shared between host
and container, so that the repository does not need to be
managed within Docker alone.

New environment variables:

- GIT_DATA_DIR: Path to aur.git repository that is bind mounted

Do note, this variable only takes affect when users run
production Docker services, by supplying:

    $ docker-compose -f docker-compose.yml -f docker-compose.prod.yml ...
This commit is contained in:
Kevin Morris 2021-10-22 21:27:46 -07:00
commit 81417ea8b2
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
2 changed files with 12 additions and 3 deletions

1
.env
View file

@ -3,3 +3,4 @@ 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_PHP=https://localhost:8443
CGIT_CLONE_PREFIX_FASTAPI=https://localhost:8444 CGIT_CLONE_PREFIX_FASTAPI=https://localhost:8444
GIT_DATA_DIR="./aur.git/"

View file

@ -7,16 +7,24 @@ services:
git: git:
volumes: volumes:
- git_data:/aurweb/aur.git - ${GIT_DATA_DIR}:/aurweb/aur.git
- cache:/cache - cache:/cache
- ${MARIADB_SOCKET_DIR}:/var/run/mysqld - ${MARIADB_SOCKET_DIR}:/var/run/mysqld
smartgit: smartgit:
volumes: volumes:
- git_data:/aurweb/aur.git - ${GIT_DATA_DIR}:/aurweb/aur.git
- cache:/cache - cache:/cache
- smartgit_run:/var/run/smartgit - smartgit_run:/var/run/smartgit
cgit-php:
volumes:
- ${GIT_DATA_DIR}:/aurweb/aur.git
cgit-fastapi:
volumes:
- ${GIT_DATA_DIR}:/aurweb/aur.git
php-fpm: php-fpm:
volumes: volumes:
- cache:/cache - cache:/cache
@ -35,7 +43,7 @@ services:
nginx: nginx:
volumes: volumes:
- git_data:/aurweb/aur.git - ${GIT_DATA_DIR}:/aurweb/aur.git
- cache:/cache - cache:/cache
- logs:/var/log/nginx - logs:/var/log/nginx
- smartgit_run:/var/run/smartgit - smartgit_run:/var/run/smartgit