diff --git a/Dockerfile b/Dockerfile index 7e9095e..e161a8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:latest +FROM ubuntu:latest RUN apt-get update && apt-get install -y \ build-essential cmake git wget tar curl ninja-build mold nodejs npm perl jq ccache nlohmann-json3-dev \ diff --git a/src/dropshell-build-install-requirements b/src/dropshell-build-install-requirements index 9d0b03f..b4b2fdc 100755 --- a/src/dropshell-build-install-requirements +++ b/src/dropshell-build-install-requirements @@ -87,12 +87,16 @@ function install_packages() { case $OS in "Ubuntu") # Common packages for both Ubuntu and Debian - PACKAGES="build-essential cmake git wget tar curl ninja-build mold nodejs npm perl jq ccache upx-ucl nlohmann-json3-dev" + PACKAGES="build-essential cmake git wget tar curl ninja-build \ + mold nodejs npm perl jq ccache upx-ucl nlohmann-json3-dev \ + sed gawk autoconf automake autotools-dev" INSTALLCMD="apt-get install -y" UPDATECMD="apt-get update" ;; "Debian GNU/Linux") - PACKAGES="build-essential cmake git wget tar curl ninja-build mold nodejs npm perl jq ccache upx-ucl nlohmann-json3-dev" + PACKAGES="build-essential cmake git wget tar curl ninja-build \ + mold nodejs npm perl jq ccache upx-ucl nlohmann-json3-dev \ + sed gawk autoconf automake autotools-dev" INSTALLCMD="apt-get install -y" UPDATECMD="apt-get update" @@ -110,7 +114,9 @@ function install_packages() { fi ;; "Alpine Linux") - PACKAGES="build-base cmake git wget tar curl ninja mold nodejs npm linux-headers perl jq ccache upx nlohmann-json-dev" + PACKAGES="build-base cmake git wget tar curl ninja \ + mold nodejs npm linux-headers perl jq ccache upx nlohmann-json-dev \ + sed gawk autoconf automake autotools-dev" INSTALLCMD="apk add --no-cache" UPDATECMD="apk update" ;;