From 1da948f9b8d40020972210f6c6253379f2760d08 Mon Sep 17 00:00:00 2001 From: thilo Date: Fri, 3 May 2019 22:27:34 +0200 Subject: [PATCH 1/3] - added sleep to give mariadb some time to be set up --- scripts/init-repo.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/init-repo.sh b/scripts/init-repo.sh index 3b98f68..156ddcc 100755 --- a/scripts/init-repo.sh +++ b/scripts/init-repo.sh @@ -141,4 +141,6 @@ touch /mnt/repo-base/volumes/accounts/auth.file.done ACCOUNTS_UID=$(docker-compose exec --user www-data accounts id -u | tr -d '\r') chown "$ACCOUNTS_UID:$ACCOUNTS_UID" /mnt/repo-base/volumes/accounts/auth.file.done +sleep 300 + bash scripts/postinstall.sh -- GitLab From 34202fb1f366e5c5c528c46793ef58a3d116f416 Mon Sep 17 00:00:00 2001 From: thilo Date: Fri, 3 May 2019 22:54:00 +0200 Subject: [PATCH 2/3] - removed nextcloud setup call --- scripts/postinstall.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh index c22abec..73c44db 100755 --- a/scripts/postinstall.sh +++ b/scripts/postinstall.sh @@ -3,10 +3,6 @@ set -e source /mnt/repo-base/scripts/base.sh -docker-compose exec -T --user www-data nextcloud php occ maintenance:install \ - --admin-user="$NEXTCLOUD_ADMIN_USER" --admin-pass="$NEXTCLOUD_ADMIN_PASSWORD" \ - --admin-email="$ALT_EMAIL" --database="mysql" - docker-compose exec -T --user www-data nextcloud php occ maintenance:mode --on docker-compose exec -T --user www-data nextcloud php occ db:add-missing-indices docker-compose exec -T --user www-data nextcloud php occ db:convert-filecache-bigint --no-interaction -- GitLab From edb05cdc0f8b8bcfe3d836877e4b08f699d57c73 Mon Sep 17 00:00:00 2001 From: thilo Date: Sat, 4 May 2019 20:55:14 +0200 Subject: [PATCH 3/3] - udpated docker-welcome image update --- templates/docker-compose/docker-compose-base.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/docker-compose/docker-compose-base.yml b/templates/docker-compose/docker-compose-base.yml index b2e2972..69c99e5 100644 --- a/templates/docker-compose/docker-compose-base.yml +++ b/templates/docker-compose/docker-compose-base.yml @@ -78,10 +78,11 @@ services: - /mnt/repo-base/volumes/redis/db:/data accounts: - image: registry.gitlab.e.foundation:5000/e/infra/docker-welcome:0.2.0 + image: registry.gitlab.e.foundation:5000/e/infra/docker-welcome:0.3.0 container_name: accounts environment: - DOMAINS=${VHOSTS_ACCOUNTS} + - DOMAIN=${DOMAIN} - IS_WELCOME=true - PFDB_HOST=mariadb - PFDB_DB=${PFDB_DB} -- GitLab