Skip to content

Commit 4ef07a9

Browse files
Merge pull request #403 from balena-io-modules/kyle/no-systemd-deps
Add missing dependencies to no-systemd variant
2 parents cdca1e2 + 1271f7a commit 4ef07a9

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM ghcr.io/balena-io-modules/confd-releases:0.0.6-confd-v0-16-0 AS confd
22

33
FROM debian:bookworm AS runtime
44

5-
ENV DEBIAN_FRONTEND noninteractive
6-
ENV TERM xterm
5+
ENV DEBIAN_FRONTEND=noninteractive
6+
ENV TERM=xterm
77

88
COPY src/01_nodoc /etc/dpkg/dpkg.cfg.d/
99
COPY src/01_buildconfig /etc/apt/apt.conf.d/
@@ -77,7 +77,7 @@ WORKDIR /usr/src/app
7777
RUN sed -i "s/rlimit-nproc=3//" /etc/avahi/avahi-daemon.conf
7878

7979
# systemd configuration
80-
ENV container lxc
80+
ENV container=lxc
8181

8282
# Set the stop signal to SIGRTMIN+3 which systemd understands as the signal to halt
8383
STOPSIGNAL SIGRTMIN+3

Dockerfile.no-systemd

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM ghcr.io/balena-io-modules/confd-releases:0.0.6-confd-v0-16-0 AS confd
22

33
FROM debian:bookworm AS runtime
44

5-
ENV DEBIAN_FRONTEND noninteractive
6-
ENV TERM xterm
5+
ENV DEBIAN_FRONTEND=noninteractive
6+
ENV TERM=xterm
77

88
COPY src/01_nodoc /etc/dpkg/dpkg.cfg.d/
99
COPY src/01_buildconfig /etc/apt/apt.conf.d/
@@ -12,14 +12,18 @@ COPY src/01_buildconfig /etc/apt/apt.conf.d/
1212
# hadolint ignore=DL3008
1313
RUN apt-get update && apt-get install -y --no-install-recommends \
1414
avahi-daemon \
15+
build-essential \
1516
ca-certificates \
1617
curl \
1718
htop \
1819
ifupdown \
1920
jq \
21+
libnss-mdns \
2022
nano \
2123
net-tools \
2224
procmail \
25+
python3 \
26+
python3-dev \
2327
strace \
2428
vim \
2529
wget \
@@ -29,6 +33,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2933
# And configure them.
3034
COPY src/htoprc /root/.config/htop/
3135
COPY src/mdns.allow /etc/mdns.allow
36+
COPY src/nsswitch.conf /etc/nsswitch.conf
3237

3338
# === Confd part ===
3439
# May be removed once we switch to a different configuration mechanism.
@@ -66,3 +71,5 @@ RUN if [ "${TARGETARCH}" = "amd64" ] ; \
6671

6772
# Confd binary installation.
6873
COPY --from=confd /confd /usr/local/bin/confd
74+
75+
WORKDIR /usr/src/app

0 commit comments

Comments
 (0)