diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 7ea659de6..c05e30803 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -183,7 +183,7 @@ jobs: with: context: . push: true - # platforms : linux/amd64,linux/arm64 + platforms : linux/amd64,linux/arm64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=registry,ref=ghcr.io/azuracast/web:buildcache 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 3e3b731c0..619764d22 100644 --- a/util/docker/web/setup/beanstalkd.sh +++ b/util/docker/web/setup/beanstalkd.sh @@ -3,9 +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 - -$minimal_apt_get_install 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