Jaap Marcus 3 lat temu
rodzic
commit
fda221d957
4 zmienionych plików z 26 dodań i 23 usunięć
  1. 1 12
      .drone.yml
  2. 0 9
      clone_hestiacp.sh
  3. 13 1
      install_apt.sh
  4. 12 1
      install_rpm.sh

+ 1 - 12
.drone.yml

@@ -12,7 +12,6 @@ steps:
     image: ubuntu:jammy
     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
@@ -22,7 +21,6 @@ steps:
     image: ubuntu:focal
     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
@@ -32,7 +30,6 @@ steps:
     image: ubuntu:bionic
     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
@@ -42,7 +39,6 @@ steps:
     image: debian:bullseye
     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
@@ -52,7 +48,6 @@ steps:
     image: debian:buster
     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
@@ -62,7 +57,6 @@ steps:
     image: debian:stretch
     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
@@ -99,7 +93,6 @@ steps:
     image: ubuntu:jammy
     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
@@ -109,7 +102,6 @@ steps:
     image: ubuntu:focal
     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
@@ -119,7 +111,7 @@ steps:
     image: ubuntu:bionic
     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
@@ -129,7 +121,6 @@ steps:
     image: debian:bullseye
     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
@@ -139,7 +130,6 @@ steps:
     image: debian:buster
     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
@@ -149,7 +139,6 @@ steps:
     image: debian:stretch
     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

+ 0 - 9
clone_hestiacp.sh

@@ -4,12 +4,3 @@
 fork="hestiacp"
 branch="main"
 
-# make sure to delete all old  traces
-rm -rf /hestiacp/
-
-git clone https://github.com/$fork/hestiacp.git
-cd ./hestiacp/
-git checkout $branch
-
-echo "Start building HestiaCP Packages"
-export TERM=xterm

+ 13 - 1
install_apt.sh

@@ -1,3 +1,15 @@
 #!/bin/bash
+source ./clone_hestiacp.sh
+
 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 
+apt-get update && apt-get install -y $software 
+
+# make sure to delete all old  traces
+rm -rf /hestiacp/
+
+git clone https://github.com/$fork/hestiacp.git
+cd ./hestiacp/
+git checkout $branch
+
+echo "Start building HestiaCP Packages"
+export TERM=xterm

+ 12 - 1
install_rpm.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+source ./clone_hestiacp.sh
 
 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'
 
@@ -10,4 +11,14 @@ dnf config-manager --set-enabled PowerTools > /dev/null 2>&1
 dnf upgrade -y -q
 echo "Installing dependencies for compilation..."
 
-dnf install -y -q $SOFTWARE
+dnf install -y -q $SOFTWARE
+
+# make sure to delete all old  traces
+rm -rf /hestiacp/
+
+git clone https://github.com/$fork/hestiacp.git
+cd ./hestiacp/
+git checkout $branch
+
+echo "Start building HestiaCP Packages"
+export TERM=xterm