Merge branch 'fix/improve-building' into main

.drone.yml

@@ -8,6 +8,19 @@ platform:
   arch: amd64
 
 steps:
+  - name: Clone HestiaCP
+    image: alpine/git
+    commands:
+      - git clone https://github.com/hestiacp/hestiacp.git
+      - cd hestiacp
+      - git checkout ${branch}
+  - name: Build JS/CSS
+    image: node:current-slim
+    commands:
+    - cd ./hestiacp/
+    - yarn set version stable
+    - yarn install
+    - yarn build
   - name: Ubuntu 22.04
     image: ubuntu:jammy
     commands:
@@ -23,7 +36,7 @@ steps:
     commands:
     - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
     - ./install_apt.sh
-    - ./build_packages.sh 
+    - ./build_packages.sh
     - mkdir -p ./packages/focal
     - mv /tmp/hestiacp-src/deb/*.deb ./packages/focal
     - rm -rf /tmp/hestia-src/
@@ -38,17 +51,7 @@ steps:
     - mv /tmp/hestiacp-src/deb/*.deb ./packages/bionic
     - rm -rf /tmp/hestia-src/
     - rm -rf ./hestiacp/
-  - name: Debian Bullseye
-    image: debian:bullseye
-    commands:
-    - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
-    - ./install_apt.sh
-    - ./build_packages.sh
-    - mkdir -p ./packages/bullseye
-    - mv /tmp/hestiacp-src/deb/*.deb ./packages/bullseye
-    - rm -rf /tmp/hestia-src/
-    - rm -rf ./hestiacp/
-  - name: Debian Buster
+  - name: Debian 10
     image: debian:buster
     commands:
     - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
@@ -58,64 +61,7 @@ steps:
     - mv /tmp/hestiacp-src/deb/*.deb ./packages/buster
     - rm -rf /tmp/hestia-src/
     - rm -rf ./hestiacp/
-  - name: scp files
-    image: appleboy/drone-scp:1.6.4
-    settings:
-      host:
-        from_secret: target_server
-      user: root
-      key:
-        from_secret: ssh_key
-      port: 22
-      command_timeout: 2m
-      target: /root/
-      source:
-        - ./packages/*
-        
-trigger:
-  event: [ push ]
-
----
-kind: pipeline
-type: docker
-name: Build Hestia for ARM64
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
-  - name: Ubuntu 22.04
-    image: ubuntu:jammy
-    commands:
-    - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
-    - ./install_apt.sh
-    - ./build_packages.sh
-    - mkdir -p ./packages/jammy
-    - mv /tmp/hestiacp-src/deb/*.deb ./packages/jammy
-    - rm -rf /tmp/hestia-src/
-    - rm -rf ./hestiacp/
-  - name: Ubuntu 20.04
-    image: ubuntu:focal
-    commands:
-    - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
-    - ./install_apt.sh
-    - ./build_packages.sh
-    - mkdir -p ./packages/focal
-    - mv /tmp/hestiacp-src/deb/*.deb ./packages/focal
-    - rm -rf /tmp/hestia-src/
-    - rm -rf ./hestiacp/
-  - name: Ubuntu 18.04
-    image: ubuntu:bionic
-    commands:
-    - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
-    - ./install_apt.sh
-    - ./build_packages.sh
-    - mkdir -p ./packages/bionic
-    - mv /tmp/hestiacp-src/deb/*.deb ./packages/bionic
-    - rm -rf /tmp/hestia-src/
-    - rm -rf ./hestiacp/
-  - name: Debian Bullseye
+  - name: Debian 11
     image: debian:bullseye
     commands:
     - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
@@ -125,19 +71,99 @@ steps:
     - mv /tmp/hestiacp-src/deb/*.deb ./packages/bullseye
     - rm -rf /tmp/hestia-src/
     - rm -rf ./hestiacp/
-  - name: Debian Buster
-    image: debian:buster
-    commands:
-    - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
-    - ./install_apt.sh
-    - ./build_packages.sh
-    - mkdir -p ./packages/buster
-    - mv /tmp/hestiacp-src/deb/*.deb ./packages/buster
-    - rm -rf /tmp/hestia-src/
-    - rm -rf ./hestiacp/
   - name: scp files
     image: appleboy/drone-scp:1.6.4
     settings:
+    host:
+      from_secret: target_server
+    user: root
+    key:
+      from_secret: ssh_key
+    port: 22
+    command_timeout: 2m
+    target: /root/
+    source:
+    - ./packages/*
+    
+trigger:
+  event: [ promote ]
+  
+---
+  kind: pipeline
+  type: docker
+  name: Build Hestia for ARM64
+  
+  platform:
+    os: linux
+    arch: arm64
+  
+  steps:
+    - name: Clone HestiaCP
+      image: alpine/git
+      commands:
+        - git clone https://github.com/hestiacp/hestiacp.git
+        - cd hestiacp
+        - git checkout ${branch}
+    - name: Build JS/CSS
+      image: node:current-slim
+      commands:
+      - cd ./hestiacp/
+      - yarn set version stable
+      - yarn install
+      - yarn build
+    - name: Ubuntu 22.04
+      image: ubuntu:jammy
+      commands:
+      - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
+      - ./install_apt.sh
+      - ./build_packages.sh
+      - mkdir -p ./packages/jammy
+      - mv /tmp/hestiacp-src/deb/*.deb ./packages/jammy
+      - rm -rf /tmp/hestia-src/
+      - rm -rf ./hestiacp/
+    - name: Ubuntu 20.04
+      image: ubuntu:focal
+      commands:
+      - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
+      - ./install_apt.sh
+      - ./build_packages.sh
+      - mkdir -p ./packages/focal
+      - mv /tmp/hestiacp-src/deb/*.deb ./packages/focal
+      - rm -rf /tmp/hestia-src/
+      - rm -rf ./hestiacp/
+    - name: Ubuntu 18.04
+      image: ubuntu:bionic
+      commands:
+      - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
+      - ./install_apt.sh
+      - ./build_packages.sh
+      - mkdir -p ./packages/bionic
+      - mv /tmp/hestiacp-src/deb/*.deb ./packages/bionic
+      - rm -rf /tmp/hestia-src/
+      - rm -rf ./hestiacp/
+    - name: Debian 10
+      image: debian:buster
+      commands:
+      - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
+      - ./install_apt.sh
+      - ./build_packages.sh
+      - mkdir -p ./packages/buster
+      - mv /tmp/hestiacp-src/deb/*.deb ./packages/buster
+      - rm -rf /tmp/hestia-src/
+      - rm -rf ./hestiacp/
+    - name: Debian 11
+      image: debian:bullseye
+      commands:
+      - ln -snf /usr/share/zoneinfo/CET /etc/localtime && echo CET > /etc/timezone
+      - ./install_apt.sh
+      - ./build_packages.sh
+      - mkdir -p ./packages/bullseye
+      - mv /tmp/hestiacp-src/deb/*.deb ./packages/bullseye
+      - rm -rf /tmp/hestia-src/
+      - rm -rf ./hestiacp/
+    - name: scp files
+      image: appleboy/drone-scp:1.6.4
+      settings:
       host:
         from_secret: target_server
       user: root
@@ -147,7 +173,25 @@ steps:
       command_timeout: 2m
       target: /root/
       source:
-        - ./packages/*
-        
-trigger:
-  event: [ push ]
+      - ./packages/*
+      
+  trigger:
+    event: [ promote ]
+    
+---
+  kind: pipeline
+  type: docker
+  name: Push
+  
+  platform:
+    os: linux
+    arch: amd64
+  
+  steps:
+    - name: Check
+      image: alpine/git
+      commands:
+        - git clone https://github.com/hestiacp/hestiacp.git
+        - cd hestiacp
+  trigger:
+  event: [ push ]

.gitignore

@@ -1 +1,2 @@
-.nova
+.nova/
+.DS_Store

install_apt.sh

@@ -1,6 +1,4 @@
 #!/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 lsb-release"
 apt-get update && apt-get install -y $software