Skip to content

Commit 148c7d2

Browse files
andrasbacsaiandrasbacsai
committed
update install scripts to pull the latest helper version during installation
1 parent 9815454 commit 148c7d2

File tree

5 files changed

+30
-12
lines changed

5 files changed

+30
-12
lines changed

‎other/nightly/install.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -e # Exit immediately if a command exits with a non-zero status
66
#set -u # Treat unset variables as an error and exit
77
set -o pipefail # Cause a pipeline to return the status of the last command that exited with a non-zero status
88

9-
VERSION="1.3.4"
9+
VERSION="1.4"
1010
DOCKER_VERSION="26.0"
1111

1212
CDN="https://cdn.coollabs.io/coolify-nightly"
@@ -45,6 +45,12 @@ if [ "$OS_TYPE" = 'amzn' ]; then
4545
fi
4646

4747
LATEST_VERSION=$(curl --silent $CDN/versions.json | grep -i version | xargs | awk '{print $2}' | tr -d ',')
48+
LATEST_HELPER_VERSION=$(curl --silent $CDN/versions.json | grep -i version | xargs | awk '{print $6}' | tr -d ',')
49+
50+
if [ -z "$LATEST_HELPER_VERSION" ]; then
51+
LATEST_HELPER_VERSION=latest
52+
fi
53+
4854
DATE=$(date +"%Y%m%d-%H%M%S")
4955

5056
if [ $EUID != 0 ]; then
@@ -75,6 +81,7 @@ echo -e "-------------"
7581

7682
echo "OS: $OS_TYPE $OS_VERSION"
7783
echo "Coolify version: $LATEST_VERSION"
84+
echo "Helper version: $LATEST_HELPER_VERSION"
7885

7986
echo -e "-------------"
8087
echo "Installing required packages..."
@@ -342,7 +349,7 @@ if ! grep -qw "root@coolify" ~/.ssh/authorized_keys; then
342349
addSshKey
343350
fi
344351

345-
bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}"
352+
bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}"
346353

347354
echo "Waiting for 20 seconds for Coolify to be ready..."
348355

‎other/nightly/upgrade.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
#!/bin/bash
22
## Do not modify this file. You will lose the ability to autoupdate!
33

4-
VERSION="1.0.6"
4+
VERSION="1.1"
55
CDN="https://cdn.coollabs.io/coolify-nightly"
6+
LATEST_IMAGE=${1:-latest}
7+
LATEST_HELPER_VERSION=${2:-latest}
68

79
curl -fsSL $CDN/docker-compose.yml -o /data/coolify/source/docker-compose.yml
810
curl -fsSL $CDN/docker-compose.prod.yml -o /data/coolify/source/docker-compose.prod.yml
@@ -31,7 +33,7 @@ docker network create --attachable coolify 2>/dev/null
3133

3234
if [ -f /data/coolify/source/docker-compose.custom.yml ]; then
3335
echo "docker-compose.custom.yml detected."
34-
docker run -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock --rm ghcr.io/coollabsio/coolify-helper bash -c "LATEST_IMAGE=${1:-} docker compose --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml -f /data/coolify/source/docker-compose.custom.yml up -d --remove-orphans --force-recreate --wait --wait-timeout 60"
36+
docker run -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock --rm ghcr.io/coollabsio/coolify-helper:${LATEST_HELPER_VERSION:-latest} bash -c "LATEST_IMAGE=${1:-} docker compose --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml -f /data/coolify/source/docker-compose.custom.yml up -d --remove-orphans --force-recreate --wait --wait-timeout 60"
3537
else
36-
docker run -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock --rm ghcr.io/coollabsio/coolify-helper bash -c "LATEST_IMAGE=${1:-} docker compose --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml up -d --remove-orphans --force-recreate --wait --wait-timeout 60"
38+
docker run -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock --rm ghcr.io/coollabsio/coolify-helper:${LATEST_HELPER_VERSION:-latest} bash -c "LATEST_IMAGE=${1:-} docker compose --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml up -d --remove-orphans --force-recreate --wait --wait-timeout 60"
3739
fi

‎scripts/install.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -e # Exit immediately if a command exits with a non-zero status
66
#set -u # Treat unset variables as an error and exit
77
set -o pipefail # Cause a pipeline to return the status of the last command that exited with a non-zero status
88

9-
VERSION="1.3.4"
9+
VERSION="1.4"
1010
DOCKER_VERSION="26.0"
1111

1212
CDN="https://cdn.coollabs.io/coolify"
@@ -45,6 +45,12 @@ if [ "$OS_TYPE" = 'amzn' ]; then
4545
fi
4646

4747
LATEST_VERSION=$(curl --silent $CDN/versions.json | grep -i version | xargs | awk '{print $2}' | tr -d ',')
48+
LATEST_HELPER_VERSION=$(curl --silent $CDN/versions.json | grep -i version | xargs | awk '{print $6}' | tr -d ',')
49+
50+
if [ -z "$LATEST_HELPER_VERSION" ]; then
51+
LATEST_HELPER_VERSION=latest
52+
fi
53+
4854
DATE=$(date +"%Y%m%d-%H%M%S")
4955

5056
if [ $EUID != 0 ]; then
@@ -75,6 +81,7 @@ echo -e "-------------"
7581

7682
echo "OS: $OS_TYPE $OS_VERSION"
7783
echo "Coolify version: $LATEST_VERSION"
84+
echo "Helper version: $LATEST_HELPER_VERSION"
7885

7986
echo -e "-------------"
8087
echo "Installing required packages..."
@@ -342,7 +349,7 @@ if ! grep -qw "root@coolify" ~/.ssh/authorized_keys; then
342349
addSshKey
343350
fi
344351

345-
bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}"
352+
bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}"
346353

347354
echo "Waiting for 20 seconds for Coolify to be ready..."
348355

‎scripts/upgrade.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
#!/bin/bash
22
## Do not modify this file. You will lose the ability to autoupdate!
33

4-
VERSION="1.0.6"
4+
VERSION="1.1"
55
CDN="https://cdn.coollabs.io/coolify"
6+
LATEST_IMAGE=${1:-latest}
7+
LATEST_HELPER_VERSION=${2:-latest}
68

79
curl -fsSL $CDN/docker-compose.yml -o /data/coolify/source/docker-compose.yml
810
curl -fsSL $CDN/docker-compose.prod.yml -o /data/coolify/source/docker-compose.prod.yml
@@ -31,7 +33,7 @@ docker network create --attachable coolify 2>/dev/null
3133

3234
if [ -f /data/coolify/source/docker-compose.custom.yml ]; then
3335
echo "docker-compose.custom.yml detected."
34-
docker run -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock --rm ghcr.io/coollabsio/coolify-helper bash -c "LATEST_IMAGE=${1:-} docker compose --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml -f /data/coolify/source/docker-compose.custom.yml up -d --remove-orphans --force-recreate --wait --wait-timeout 60"
36+
docker run -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock --rm ghcr.io/coollabsio/coolify-helper:${LATEST_HELPER_VERSION:-latest} bash -c "LATEST_IMAGE=${1:-} docker compose --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml -f /data/coolify/source/docker-compose.custom.yml up -d --remove-orphans --force-recreate --wait --wait-timeout 60"
3537
else
36-
docker run -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock --rm ghcr.io/coollabsio/coolify-helper bash -c "LATEST_IMAGE=${1:-} docker compose --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml up -d --remove-orphans --force-recreate --wait --wait-timeout 60"
38+
docker run -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock --rm ghcr.io/coollabsio/coolify-helper:${LATEST_HELPER_VERSION:-latest} bash -c "LATEST_IMAGE=${1:-} docker compose --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml up -d --remove-orphans --force-recreate --wait --wait-timeout 60"
3739
fi

‎versions.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"coolify": {
33
"v4": {
4-
"version": "4.0.0-beta.330"
4+
"version": "4.0.0-beta.329"
55
},
66
"nightly": {
7-
"version": "4.0.0-beta.331"
7+
"version": "4.0.0-beta.330"
88
},
99
"helper": {
1010
"version": "1.0.0"

0 commit comments

Comments
 (0)