Skip to content

Improve Dockerfile #2

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

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

Improve Dockerfile #2

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2eb4aea
Implement Dockerfile best practices
Harvester57 Dec 9, 2025
9a2f669
Switch base image to slim variant
Harvester57 Dec 9, 2025
6972818
Install dev dependencies in a single layer
Harvester57 Dec 9, 2025
a0f86c8
Multi stage build
Harvester57 Dec 10, 2025
f9cb1dd
Cleanup build stage
Harvester57 Dec 10, 2025
950826d
Decrease build time
Harvester57 Dec 10, 2025
3c68d4c
Merge branch 'main' into improve-dockerfile
Harvester57 Dec 11, 2025
2a930f5
Make dhclient executable
Harvester57 Dec 12, 2025
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
42 changes: 27 additions & 15 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
FROM debian:13@sha256:0d01188e8dd0ac63bf155900fad49279131a876a1ea7fac917c62e87ccb2732d
FROM debian:13@sha256:0d01188e8dd0ac63bf155900fad49279131a876a1ea7fac917c62e87ccb2732d AS builder

RUN apt-get update
RUN apt-get install -y supervisor iproute2 iptables gettext-base
ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get install -y build-essential git
RUN git clone https://github.com/Raraph84/dhclient-orange-patched /tmp/dhclient-orange-patched
RUN cd /tmp/dhclient-orange-patched && ./configure && make && make install
RUN cp /tmp/dhclient-orange-patched/client/scripts/linux /sbin/dhclient-script && chmod +x /sbin/dhclient-script
RUN mkdir -p /var/lib/dhcp /etc/dhclient-enter-hooks.d /etc/dhclient-exit-hooks.d
RUN rm -rf /tmp/dhclient-orange-patched
RUN apt-get remove -y build-essential git && apt-get autoremove -y && apt-get clean
RUN apt-get update && \
apt-get install -y --no-install-recommends build-essential git ca-certificates && \
update-ca-certificates && \
git clone --depth 1 https://github.com/Raraph84/dhclient-orange-patched /tmp/dhclient-orange-patched && \
cd /tmp/dhclient-orange-patched && \
./configure && make -j$(( $(nproc) + 1 )) && make install

FROM debian:13-slim@sha256:e711a7b30ec1261130d0a121050b4ed81d7fb28aeabcf4ea0c7876d4e9f5aca2

ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get update && \
apt-get install --no-install-recommends -y supervisor iproute2 iptables gettext-base && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* && \
mkdir -p /var/lib/dhcp /etc/dhclient-enter-hooks.d /etc/dhclient-exit-hooks.d

COPY --from=builder /tmp/dhclient-orange-patched/client/scripts/linux /sbin/dhclient-script
COPY --from=builder /usr/local/sbin/dhclient /usr/local/sbin/dhclient
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY init.sh /usr/local/bin/init.sh
COPY up-fiber.sh /usr/local/bin/up-fiber.sh
Expand All @@ -20,11 +30,13 @@ COPY dhclient-orange-v6.conf.template /etc/dhcp/dhclient-orange-v6.conf.template
COPY no-dns-dhcp-enter-hook.sh /etc/dhclient-enter-hooks.d/no-dns
COPY ipv6-dhcp-exit-hook.sh /etc/dhclient-exit-hooks.d/setup-ipv6

RUN chmod +x /usr/local/bin/init.sh
RUN chmod +x /etc/dhcp/dhclient-orange-generator.sh
RUN chmod +x /usr/local/bin/up-fiber.sh
RUN chmod +x /etc/dhclient-enter-hooks.d/no-dns
RUN chmod +x /etc/dhclient-exit-hooks.d/setup-ipv6
RUN chmod +x /usr/local/bin/init.sh \
/etc/dhcp/dhclient-orange-generator.sh \
/usr/local/bin/up-fiber.sh \
/etc/dhclient-enter-hooks.d/no-dns \
/etc/dhclient-exit-hooks.d/setup-ipv6 \
/sbin/dhclient-script \
/usr/local/sbin/dhclient

ENV LAN_INTERFACE=eth0
ENV WAN_INTERFACE=eth1
Expand Down
Loading