diff --git a/dropshell-build/Dockerfile b/dropshell-build/Dockerfile index c734ce7..c5ba65f 100644 --- a/dropshell-build/Dockerfile +++ b/dropshell-build/Dockerfile @@ -4,7 +4,7 @@ RUN apt-get update && apt-get install -y \ build-essential \ cmake \ git \ - nlohmann-json3-dev wget curl cmake ninja-build mold build-essential nodejs npm jq \ + nlohmann-json3-dev wget curl cmake ninja-build mold build-essential nodejs npm jq ccache \ && rm -rf /var/lib/apt/lists/* #RUN curl -fsSL https://get.docker.com | sh diff --git a/dropshell-build/src/dropshell-build b/dropshell-build/src/dropshell-build index f20b788..be65842 100755 --- a/dropshell-build/src/dropshell-build +++ b/dropshell-build/src/dropshell-build @@ -67,8 +67,6 @@ function check_packages() { fi echo "Package $pkg is installed" done - - } @@ -260,6 +258,8 @@ function buildspawn() { # ---------------------------------------------------------------------------------------------------------- function main() { + check_packages + while getopts "rm" opt; do case $opt in r) diff --git a/dropshell-build/src/install_dropshell_build_requirements b/dropshell-build/src/install_dropshell_build_requirements index 672ea34..a3b706f 100755 --- a/dropshell-build/src/install_dropshell_build_requirements +++ b/dropshell-build/src/install_dropshell_build_requirements @@ -79,12 +79,12 @@ function install_packages() { case $OS in "Ubuntu"|"Debian GNU/Linux") # Common packages for both Ubuntu and Debian - PACKAGES="build-essential cmake git wget tar curl ninja-build mold nodejs npm perl jq" - INSTALLCMD="apt-get install -y" + PACKAGES="build-essential cmake git wget tar curl ninja-build mold nodejs npm perl jq ccache" + INSTALLCMD="apt-get install -y" UPDATECMD="apt-get update" ;; "Alpine Linux") - PACKAGES="build-base cmake git wget tar curl ninja mold nodejs npm linux-headers perl jq" + PACKAGES="build-base cmake git wget tar curl ninja mold nodejs npm linux-headers perl jq ccache" INSTALLCMD="apk add --no-cache" UPDATECMD="apk update" ;;