Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/nextcloudpi.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorTobias Knöppler <6317548+theCalcaholic@users.noreply.github.com>2022-08-12 15:34:48 +0300
committerGitHub <noreply@github.com>2022-08-12 15:34:48 +0300
commit64ce2b2643a5564499ad14c5ba6308a58018fc0d (patch)
treeef165a109024f2f1c97c84bd41a05bb8b022f307 /bin
parent5bf6505ac5afc0ddedda18c378f7133144a5a271 (diff)
Implement automated tests for all images (#1529)
Diffstat (limited to 'bin')
-rw-r--r--bin/ncp/CONFIG/nc-limits.sh2
-rw-r--r--bin/ncp/UPDATES/unattended-upgrades.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/bin/ncp/CONFIG/nc-limits.sh b/bin/ncp/CONFIG/nc-limits.sh
index c9fbf87e..18fc5c1b 100644
--- a/bin/ncp/CONFIG/nc-limits.sh
+++ b/bin/ncp/CONFIG/nc-limits.sh
@@ -12,6 +12,8 @@ configure()
{
# Set auto memory limit to 75% of the total memory
local TOTAL_MEM="$( free -b | sed -n 2p | awk '{ print $2 }' )"
+ # special case of 32bit emulation (e.g. 32bit-docker on 64bit hardware)
+ file /bin/bash | grep 64-bit > /dev/null || TOTAL_MEM="$(( 1024 * 1024 * 1024 * 4 ))"
AUTOMEM=$(( TOTAL_MEM * 75 / 100 ))
# MAX FILESIZE
diff --git a/bin/ncp/UPDATES/unattended-upgrades.sh b/bin/ncp/UPDATES/unattended-upgrades.sh
index 24d7fe38..d708c0d3 100644
--- a/bin/ncp/UPDATES/unattended-upgrades.sh
+++ b/bin/ncp/UPDATES/unattended-upgrades.sh
@@ -12,7 +12,7 @@
install()
{
apt-get update
- apt install -y --no-install-recommends unattended-upgrades
+ apt-get install -y --no-install-recommends unattended-upgrades
rm -f /etc/apt/apt.conf.d/20auto-upgrades /etc/apt/apt.conf.d/02-armbian-periodic
}