Unverified Commit 64975557 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

fix: Validate lscpu output (#798)

parent b6232180

Dockerfile

+3 −3
Original line number Diff line number Diff line
@@ -54,9 +54,9 @@ COPY --chmod=744 ./web/nginx.conf /etc/nginx/sites-enabled/web.conf 
VOLUME /storage

EXPOSE 22 139 445 5000



ENV RAM_SIZE "1G"

ENV DISK_SIZE "16G"

ENV CPU_CORES "1"

ENV RAM_SIZE="1G"

ENV DISK_SIZE="16G"

ENV CPU_CORES="1"



HEALTHCHECK --interval=60s --start-period=45s --retries=2 CMD /run/check.sh

src/reset.sh

+13 −2
Original line number Diff line number Diff line
@@ -38,14 +38,25 @@ TEMPLATE="/var/www/index.html" 
FOOTER1="$APP for Docker v$(</run/version)"

FOOTER2="<a href='$SUPPORT'>$SUPPORT</a>"



CPI=$(lscpu)

SYS=$(uname -r)

HOST=$(hostname -s)

KERNEL=$(echo "$SYS" | cut -b 1)

MINOR=$(echo "$SYS" | cut -d '.' -f2)

ARCH=$(dpkg --print-architecture)

CORES=$(grep -c '^processor' /proc/cpuinfo)

SOCKETS=$(lscpu | grep -m 1 -i 'socket(s)' | awk '{print $(2)}')

CPU=$(lscpu | grep -m 1 -i 'model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')



if ! grep -qi "socket(s)" <<< "$CPI"; then

  SOCKETS=1

else

  SOCKETS=$(echo "$CPI" | grep -m 1 -i 'socket(s)' | awk '{print $(2)}')

fi



if ! grep -qi "model name" <<< "$CPI"; then

  CPU="Unknown"

else

  CPU=$(echo "$CPI" | grep -m 1 -i 'model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')

fi



# Check system