Browse Source

Split up clone_hestia in 2 files allow easier adding RHEL in the future

Jaap Marcus 3 years ago
parent
commit
da36ea6572
4 changed files with 29 additions and 2 deletions
  1. 12 0
      .drone.yml
  2. 1 2
      clone_hestiacp.sh
  3. 3 0
      install_apt.sh
  4. 13 0
      install_rpm.sh

+ 12 - 0
.drone.yml

@@ -13,6 +13,7 @@ steps:
     commands:
     - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
     - ./clone_hestiacp.sh
+    - ./install_apt.sh
     - ./hestiacp/src/hst_autocompile.sh --dontinstalldeps --all --noinstall --keepbuild --debug '~localsrc'
     - mkdir -p ./packages/jammy
     - mv /tmp/hestiacp-src/deb/*.deb ./packages/jammy
@@ -22,6 +23,7 @@ steps:
     commands:
     - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
     - ./clone_hestiacp.sh
+    - ./install_apt.sh
     - ./hestiacp/src/hst_autocompile.sh --dontinstalldeps --all --noinstall --keepbuild --debug '~localsrc'    
     - mkdir -p ./packages/focal
     - mv /tmp/hestiacp-src/deb/*.deb ./packages/focal
@@ -31,6 +33,7 @@ steps:
     commands:
     - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
     - ./clone_hestiacp.sh
+    - ./install_apt.sh
     - ./hestiacp/src/hst_autocompile.sh --dontinstalldeps --all --noinstall --keepbuild --debug '~localsrc'
     - mkdir -p ./packages/bionic
     - mv /tmp/hestiacp-src/deb/*.deb ./packages/bionic
@@ -40,6 +43,7 @@ steps:
     commands:
     - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
     - ./clone_hestiacp.sh
+    - ./install_apt.sh
     - ./hestiacp/src/hst_autocompile.sh --dontinstalldeps --all --noinstall --keepbuild --debug '~localsrc'
     - mkdir -p ./packages/bullseye
     - mv /tmp/hestiacp-src/deb/*.deb ./packages/bullseye
@@ -49,6 +53,7 @@ steps:
     commands:
     - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
     - ./clone_hestiacp.sh
+    - ./install_apt.sh
     - ./hestiacp/src/hst_autocompile.sh --dontinstalldeps --all --noinstall --keepbuild --debug '~localsrc'
     - mkdir -p ./packages/buster
     - mv /tmp/hestiacp-src/deb/*.deb ./packages/buster
@@ -58,6 +63,7 @@ steps:
     commands:
     - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
     - ./clone_hestiacp.sh
+    - ./install_apt.sh
     - ./hestiacp/src/hst_autocompile.sh --dontinstalldeps --all --noinstall --keepbuild --debug '~localsrc'
     - mkdir -p ./packages/stretch
     - mv /tmp/hestiacp-src/deb/*.deb ./packages/stretch
@@ -94,6 +100,7 @@ steps:
     commands:
     - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
     - ./clone_hestiacp.sh
+    - ./install_apt.sh
     - ./hestiacp/src/hst_autocompile.sh --dontinstalldeps --all --noinstall --keepbuild --debug '~localsrc'
     - mkdir -p ./packages/jammy
     - mv /tmp/hestiacp-src/deb/*.deb ./packages/jammy
@@ -103,6 +110,7 @@ steps:
     commands:
     - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
     - ./clone_hestiacp.sh
+    - ./install_apt.sh
     - ./hestiacp/src/hst_autocompile.sh --dontinstalldeps --all --noinstall --keepbuild --debug '~localsrc'
     - mkdir -p ./packages/focal
     - mv /tmp/hestiacp-src/deb/*.deb ./packages/focal
@@ -112,6 +120,7 @@ steps:
     commands:
     - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
     - ./clone_hestiacp.sh
+    - ./install_apt.sh
     - ./hestiacp/src/hst_autocompile.sh --dontinstalldeps --all --noinstall --keepbuild --debug '~localsrc'
     - mkdir -p ./packages/bionic
     - mv /tmp/hestiacp-src/deb/*.deb ./packages/bionic
@@ -121,6 +130,7 @@ steps:
     commands:
     - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
     - ./clone_hestiacp.sh
+    - ./install_apt.sh
     - ./hestiacp/src/hst_autocompile.sh --dontinstalldeps --all --noinstall --keepbuild --debug '~localsrc'
     - mkdir -p ./packages/bullseye
     - mv /tmp/hestiacp-src/deb/*.deb ./packages/bullseye
@@ -130,6 +140,7 @@ steps:
     commands:
     - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
     - ./clone_hestiacp.sh
+    - ./install_apt.sh
     - ./hestiacp/src/hst_autocompile.sh --dontinstalldeps --all --noinstall --keepbuild --debug '~localsrc'
     - mkdir -p ./packages/buster
     - mv /tmp/hestiacp-src/deb/*.deb ./packages/buster
@@ -139,6 +150,7 @@ steps:
     commands:
     - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
     - ./clone_hestiacp.sh
+    - ./install_apt.sh
     - ./hestiacp/src/hst_autocompile.sh --dontinstalldeps --all --noinstall --keepbuild --debug '~localsrc'
     - mkdir -p ./packages/stretch
     - mv /tmp/hestiacp-src/deb/*.deb ./packages/stretch

+ 1 - 2
clone_hestiacp.sh

@@ -3,11 +3,10 @@
 # Branch to build packages from.
 fork="hestiacp"
 branch="staging/1.6.1"
-software="build-essential libxml2-dev libz-dev libzip-dev libgmp-dev libcurl4-gnutls-dev unzip openssl libssl-dev pkg-config libsqlite3-dev libonig-dev rpm git wget curl"
+
 # make sure to delete all old  traces
 rm -rf /hestiacp/
 
-apt-get update && apt-get install -y $software 
 git clone https://github.com/$fork/hestiacp.git
 cd ./hestiacp/
 git checkout $branch

+ 3 - 0
install_apt.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+software="build-essential libxml2-dev libz-dev libzip-dev libgmp-dev libcurl4-gnutls-dev unzip openssl libssl-dev pkg-config libsqlite3-dev libonig-dev rpm git wget curl"
+apt-get update && apt-get install -y $software 

+ 13 - 0
install_rpm.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+SOFTWARE='gcc gcc-c++ make libxml2-devel zlib-devel libzip-devel gmp-devel libcurl-devel gnutls-devel unzip openssl openssl-devel pkg-config sqlite-devel oniguruma-devel rpm-build wget tar git curl perl-IPC-Cmd'
+
+echo "Updating system DNF repositories..."
+dnf install -y -q 'dnf-command(config-manager)'
+dnf install -y -q dnf-plugins-core
+dnf config-manager --set-enabled powertools > /dev/null 2>&1
+dnf config-manager --set-enabled PowerTools > /dev/null 2>&1
+dnf upgrade -y -q
+echo "Installing dependencies for compilation..."
+
+dnf install -y -q $SOFTWARE