From 85f36fce0d2373ad992e17ab20569d1c8f3ee1b0 Mon Sep 17 00:00:00 2001 From: Kristian Klausen Date: Sat, 16 Oct 2021 18:33:39 +0200 Subject: [PATCH] fixes --- .gitlab-ci.yml | 2 +- docker-compose.prod.yml => docker-compose.aur-dev.yml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) rename docker-compose.prod.yml => docker-compose.aur-dev.yml (91%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3c25a37..d53805ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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}" & - export DOCKER_HOST="unix:///tmp/docker.sock" - 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 diff --git a/docker-compose.prod.yml b/docker-compose.aur-dev.yml similarity index 91% rename from docker-compose.prod.yml rename to docker-compose.aur-dev.yml index 9ea26663..34964b7a 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.aur-dev.yml @@ -6,12 +6,14 @@ services: - cache:/cache git: + restart: always volumes: - ${GIT_DATA_DIR}:/aurweb/aur.git - cache:/cache - ${MARIADB_SOCKET_DIR}:/var/run/mysqld smartgit: + restart: always volumes: - ${GIT_DATA_DIR}:/aurweb/aur.git - cache:/cache @@ -26,11 +28,13 @@ services: - ${GIT_DATA_DIR}:/aurweb/aur.git php-fpm: + restart: always volumes: - cache:/cache - ${MARIADB_SOCKET_DIR}:/var/run/mysqld fastapi: + restart: always environment: - FASTAPI_BACKEND="gunicorn" volumes: @@ -42,6 +46,7 @@ services: - ${MARIADB_SOCKET_DIR}:/var/run/mysqld nginx: + restart: always volumes: - ${GIT_DATA_DIR}:/aurweb/aur.git - cache:/cache