From a3517d28fac34f894cbf57c7c5a2c73d55e8b90c Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 3 May 2023 09:00:57 +0200 Subject: [PATCH 1/5] fix --- scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index d34bc6182..48ec5414f 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -11,7 +11,7 @@ OS_TYPE=$(cat /etc/os-release | grep -w "ID" | cut -d "=" -f 2 | tr -d '"') OS_VERSION=$(cat /etc/os-release | grep -w "VERSION_ID" | cut -d "=" -f 2 | tr -d '"') LATEST_VERSION=$(curl --silent https://get.coollabs.io/versions.json | grep -i version | sed -n '2p' | xargs | awk '{print $2}' | tr -d ',') -if [ "$EUID" -ne 0 ]; then +if [ $EUID -ne 0 ]; then echo "Please run as root" exit fi From 218e5ecb359e78e01f0db508b1b42f5ff45123e2 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 3 May 2023 09:01:58 +0200 Subject: [PATCH 2/5] fix --- scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index 48ec5414f..4d512120a 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -11,7 +11,7 @@ OS_TYPE=$(cat /etc/os-release | grep -w "ID" | cut -d "=" -f 2 | tr -d '"') OS_VERSION=$(cat /etc/os-release | grep -w "VERSION_ID" | cut -d "=" -f 2 | tr -d '"') LATEST_VERSION=$(curl --silent https://get.coollabs.io/versions.json | grep -i version | sed -n '2p' | xargs | awk '{print $2}' | tr -d ',') -if [ $EUID -ne 0 ]; then +if [ $EUID != 0 ]; then echo "Please run as root" exit fi From c3cb5c7356b32ba318e4c97fad05e46c6123b9c2 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 3 May 2023 09:02:20 +0200 Subject: [PATCH 3/5] fix db-migration --- docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up b/docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up index 8618a7e8c..36ca6da39 100644 --- a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up +++ b/docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up @@ -1,7 +1,7 @@ #!/command/execlineb -P VERSION=$(php bootstrap/getVersion.php) -if echo "$VERSION" | grep -q "nightly"; then +if [ echo "$VERSION" | grep -q "nightly" ]; then php /var/www/html/artisan migrate:fresh --force php /var/www/html/artisan db:seed --class ProductionSeeder --force else From 6f3f31b8722fec5fecc2932a36cd6a5f782c1bde Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 3 May 2023 09:06:33 +0200 Subject: [PATCH 4/5] test --- .../etc/s6-overlay/s6-rc.d/db-migration/up | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up b/docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up index 36ca6da39..d49e2b59a 100644 --- a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up +++ b/docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up @@ -1,9 +1,9 @@ #!/command/execlineb -P VERSION=$(php bootstrap/getVersion.php) - -if [ echo "$VERSION" | grep -q "nightly" ]; then - php /var/www/html/artisan migrate:fresh --force - php /var/www/html/artisan db:seed --class ProductionSeeder --force -else - php /var/www/html/artisan migrate --force --isolated -fi +echo "$VERSION" +# if [ echo "$VERSION" | grep -q "nightly" ]; then +# php /var/www/html/artisan migrate:fresh --force +# php /var/www/html/artisan db:seed --class ProductionSeeder --force +# else +php /var/www/html/artisan migrate --force --isolated +# fi From 124e5d94eddd2ec30140a9d06c35d43178c1a01c Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 3 May 2023 09:09:43 +0200 Subject: [PATCH 5/5] revert migration --- docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up b/docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up index d49e2b59a..250d5d8b1 100644 --- a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up +++ b/docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up @@ -1,9 +1,2 @@ #!/command/execlineb -P -VERSION=$(php bootstrap/getVersion.php) -echo "$VERSION" -# if [ echo "$VERSION" | grep -q "nightly" ]; then -# php /var/www/html/artisan migrate:fresh --force -# php /var/www/html/artisan db:seed --class ProductionSeeder --force -# else php /var/www/html/artisan migrate --force --isolated -# fi