Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to use newer Systemd dev and official promtail build #222

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update to use newer Systemd dev and official promtail build #222

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e3fe34
use latest official promtail
LucidityCrash May 31, 2023
4669c31
Getting Backports systemd-dev
LucidityCrash Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions promtail/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64
ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:6.2.7
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure about the version here but without it the image wouldn't build

ARG BUILD_ARCH=amd64

# https://github.com/mdegat01/promtail-journal/releases
FROM ghcr.io/mdegat01/promtail-journal/${BUILD_ARCH}:1.6.0 as build_promtail
#FROM ghcr.io/mdegat01/promtail-journal/${BUILD_ARCH}:1.6.0 as build_promtail

# https://github.com/hassio-addons/addon-debian-base/releases
# hadolint ignore=DL3006
Expand All @@ -13,11 +13,12 @@ ARG BUILD_ARCH=amd64
ARG YQ_VERSION=4.27.3

# Add yq and tzdata (required for the timestamp stage)
RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list
RUN apt-get update && apt-get install -t bullseye-backports -qy libsystemd-dev
RUN set -eux; \
apt-get update; \
apt-get install -qy --no-install-recommends \
tar=1.34+dfsg-1 \
libsystemd-dev=247.3-7+deb11u1 \
; \
update-ca-certificates; \
\
Expand All @@ -40,7 +41,7 @@ RUN set -eux; \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*;

# Add promtail
COPY --from=build_promtail /usr/bin/promtail /usr/bin/promtail
COPY --from=grafana/promtail:latest /usr/bin/promtail /usr/bin/promtail
RUN promtail --version

COPY rootfs /
Expand Down