diff --git a/promtail/Dockerfile b/promtail/Dockerfile index cf42b99..beab22a 100644 --- a/promtail/Dockerfile +++ b/promtail/Dockerfile @@ -13,15 +13,12 @@ ARG YQ_VERSION ARG PROMTAIL_VERSION # Add yq and tzdata (required for the timestamp stage) -RUN apt-get update && apt-get install -qy libsystemd-dev RUN set -eux; \ apt-get update; \ apt-get install -qy --no-install-recommends \ tar \ unzip \ - psmisc \ - procps \ - strace \ + libsystemd-dev \ ; \ update-ca-certificates; \ case "${BUILD_ARCH}" in \ @@ -51,8 +48,6 @@ RUN set -eux; \ COPY rootfs / WORKDIR /data/promtail -COPY s6-overlay /package/admin/s6-overlay-3.1.5.0/ - # Labels LABEL \ io.hass.name="${BUILD_NAME}" \ diff --git a/promtail/apparmor.txt.old b/promtail/apparmor.txt.old index bab8fb4..3b010fc 100644 --- a/promtail/apparmor.txt.old +++ b/promtail/apparmor.txt.old @@ -27,7 +27,7 @@ profile hassio_promtail flags=(attach_disconnected,mediate_deleted) { /init rix, /bin/** rix, /usr/bin/** rix, - /usr/sbin/** rix, + /usr/sbin/** rix, @{do_etc}/s6*/** r, @{do_etc}/fix-attrs.d/{,**} r, @{do_etc}/cont-{init,finish}.d/{,**} rwix, @@ -48,7 +48,11 @@ profile hassio_promtail flags=(attach_disconnected,mediate_deleted) { @{do_etc}/* rw, @{do_usr}/share/{,**} r, /var/cache/{,**} rw, - /var/cache/debconf/{,**} rw, + /var/cache/debconf rw, + /var/cache/debconf/{,**} rwklam, + /lib/{,**} rix, + /usr/lib/{,**} rix, + /dev/urandom r, # Bashio /usr/lib/bashio/** ix, diff --git a/promtail/s6-overlay/etc/s6-rc/scripts/base-addon-timezone b/promtail/s6-overlay/etc/s6-rc/scripts/base-addon-timezone deleted file mode 100755 index 530f5f9..0000000 --- a/promtail/s6-overlay/etc/s6-rc/scripts/base-addon-timezone +++ /dev/null @@ -1,15 +0,0 @@ -#!/command/with-contenv bashio -# shellcheck shell=bash -# ============================================================================== -# Home Assistant Community Add-on: Base Images -# Configures the timezone -# ============================================================================== - -set -x - -bashio::log.info "Configuring timezone (${TZ:-None})..." - -ln --symbolic --no-dereference --force "/usr/share/zoneinfo/${TZ:-UTC}" /etc/localtime -echo "${TZ:-UTC}" > /etc/timezone -ls -al /var/cache/debconf -strace dpkg-reconfigure --frontend noninteractive tzdata \ No newline at end of file