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

fixes

Browse source
This commit is contained in:
Kristian Klausen 2021-10-16 18:33:39 +02:00 • committed by Kevin Morris
parent a333cd0fee
commit 85f36fce0d
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -54,4 +54,4 @@ deploy:
- socat "UNIX-LISTEN:/tmp/docker.sock,reuseaddr,fork" EXEC:"ssh -o UserKnownHostsFile=${SSH_KNOWN_HOSTS} -Ti ${SSH_KEY} ${SSH_USER}@${SSH_HOST}" & - socat "UNIX-LISTEN:/tmp/docker.sock,reuseaddr,fork" EXEC:"ssh -o UserKnownHostsFile=${SSH_KNOWN_HOSTS} -Ti ${SSH_KEY} ${SSH_USER}@${SSH_HOST}" &
- export DOCKER_HOST="unix:///tmp/docker.sock" - export DOCKER_HOST="unix:///tmp/docker.sock"
- docker-compose build - docker-compose build
- docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d - docker-compose -f docker-compose.yml -f docker-compose.aur-dev.yml up -d

5
docker-compose.prod.yml → docker-compose.aur-dev.yml
View file

@ -6,12 +6,14 @@ services:
- cache:/cache - cache:/cache
git: git:
restart: always
volumes: volumes:
- ${GIT_DATA_DIR}:/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:
restart: always
volumes: volumes:
- ${GIT_DATA_DIR}:/aurweb/aur.git - ${GIT_DATA_DIR}:/aurweb/aur.git
- cache:/cache - cache:/cache
@ -26,11 +28,13 @@ services:
- ${GIT_DATA_DIR}:/aurweb/aur.git - ${GIT_DATA_DIR}:/aurweb/aur.git
php-fpm: php-fpm:
restart: always
volumes: volumes:
- cache:/cache - cache:/cache
- ${MARIADB_SOCKET_DIR}:/var/run/mysqld - ${MARIADB_SOCKET_DIR}:/var/run/mysqld
fastapi: fastapi:
restart: always
environment: environment:
- FASTAPI_BACKEND="gunicorn" - FASTAPI_BACKEND="gunicorn"
volumes: volumes:
@ -42,6 +46,7 @@ services:
- ${MARIADB_SOCKET_DIR}:/var/run/mysqld - ${MARIADB_SOCKET_DIR}:/var/run/mysqld
nginx: nginx:
restart: always
volumes: volumes:
- ${GIT_DATA_DIR}:/aurweb/aur.git - ${GIT_DATA_DIR}:/aurweb/aur.git
- cache:/cache - cache:/cache