From 834581e4d813d56332e49c3849272142a8d15d28 Mon Sep 17 00:00:00 2001 From: "Buster \"Silver Eagle\" Neece" Date: Mon, 13 Dec 2021 02:11:37 -0600 Subject: [PATCH] Remove postinst on cron and beanstalkd. --- util/docker/web/buildconfig | 18 ++++++++++++++++++ util/docker/web/setup/beanstalkd.sh | 9 ++------- util/docker/web/setup/cron.sh | 5 +---- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/util/docker/web/buildconfig b/util/docker/web/buildconfig index 3973f55bb..4820ef9e9 100644 --- a/util/docker/web/buildconfig +++ b/util/docker/web/buildconfig @@ -2,3 +2,21 @@ export LC_ALL=C export DEBIAN_FRONTEND=noninteractive minimal_apt_get_install='apt-get install -y --no-install-recommends' + +install_without_postinst() { + local PACKAGE + PACKAGE=$1 + + mkdir -p /tmp/install_$PACKAGE + cd /tmp/install_$PACKAGE + + apt-get download $PACKAGE + dpkg --unpack $PACKAGE*.deb + rm -f /var/lib/dpkg/info/$PACKAGE.postinst + dpkg --configure $PACKAGE + + apt-get install -yf #To fix dependencies + + cd / + rm -rf /tmp/install_$PACKAGE +} diff --git a/util/docker/web/setup/beanstalkd.sh b/util/docker/web/setup/beanstalkd.sh index 52515399f..619764d22 100644 --- a/util/docker/web/setup/beanstalkd.sh +++ b/util/docker/web/setup/beanstalkd.sh @@ -3,11 +3,6 @@ set -e source /bd_build/buildconfig set -x -apt-get update +$minimal_apt_get_install netbase -# Prevent systemd auto-startup -ln -s /dev/null /etc/systemd/system/beanstalkd.service - -echo "STARTTIME=30" > /etc/default/beanstalkd - -$minimal_apt_get_install -o Dpkg::Options::="--force-confdef" beanstalkd +install_without_postinst beanstalkd diff --git a/util/docker/web/setup/cron.sh b/util/docker/web/setup/cron.sh index 15a918cba..7499f50fc 100644 --- a/util/docker/web/setup/cron.sh +++ b/util/docker/web/setup/cron.sh @@ -3,10 +3,7 @@ set -e source /bd_build/buildconfig set -x -# Prevent systemd auto-startup -ln -s /dev/null /etc/systemd/system/cron.service - -$minimal_apt_get_install cron +install_without_postinst cron chmod 600 /etc/crontab