Просмотр исходного кода

Fix issue with building due to missing packages on some images (#4135)

* Fix building pacakges
* remove nodejs from first install
Jaap Marcus 2 лет назад
Родитель
Сommit
bbcc402661
1 измененных файлов с 10 добавлено и 4 удалено
  1. 10 4
      src/hst_autocompile.sh

+ 10 - 4
src/hst_autocompile.sh

@@ -270,7 +270,12 @@ if [ "$dontinstalldeps" != 'true' ]; then
 		fi
 	else
 		# Set package dependencies for compiling
-		SOFTWARE='wget tar git curl build-essential libxml2-dev libz-dev libzip-dev libgmp-dev libcurl4-gnutls-dev unzip openssl nodejs libssl-dev pkg-config libsqlite3-dev libonig-dev rpm lsb-release'
+		SOFTWARE='wget tar git curl build-essential libxml2-dev libz-dev libzip-dev libgmp-dev libcurl4-gnutls-dev unzip openssl libssl-dev pkg-config libsqlite3-dev libonig-dev rpm lsb-release'
+
+		echo "Updating system APT repositories..."
+		apt-get -qq update > /dev/null 2>&1
+		echo "Installing dependencies for compilation..."
+		apt-get -qq install -y $SOFTWARE > /dev/null 2>&1
 
 		# Installing NodeJS 20.x repo
 		apt="/etc/apt/sources.list.d"
@@ -283,12 +288,13 @@ if [ "$dontinstalldeps" != 'true' ]; then
 			curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor | tee /usr/share/keyrings/nodesource.gpg > /dev/null 2>&1
 		fi
 
-		echo "Updating system APT repositories..."
+		echo "Install NodeJS...."
 		apt-get -qq update > /dev/null 2>&1
-		echo "Installing dependencies for compilation..."
-		apt-get -qq install -y $SOFTWARE > /dev/null 2>&1
+		apt -qq install -y nodejs > /dev/null 2>&1
 
 		nodejs_version=$(/usr/bin/node -v | cut -f1 -d'.' | sed 's/v//g')
+		echo /usr/bin/node -v
+		echo $nodejs_version
 		if [ "$nodejs_version" -lt 18 ]; then
 			echo "Requires NodeJS 18.x or higher"
 			exit 1