Skip to content
This repository was archived by the owner on Jan 5, 2025. It is now read-only.

Commit 1af96c1

Browse files
committed
Switch from my_init to dumb-init, avoiding python3 dependency
We're using version 1.2.0 of dumb-init, the latest stable version.
1 parent d449b02 commit 1af96c1

File tree

5 files changed

+5
-357
lines changed

5 files changed

+5
-357
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ ARG DEBIAN_FRONTEND=noninteractive
77
RUN apt-get -q -y update \
88
&& apt-get -q -y -o "DPkg::Options::=--force-confold" -o "DPkg::Options::=--force-confdef" install apt-utils \
99
&& apt-get -q -y -o "DPkg::Options::=--force-confold" -o "DPkg::Options::=--force-confdef" dist-upgrade \
10-
&& apt-get -q -y -o "DPkg::Options::=--force-confold" -o "DPkg::Options::=--force-confdef" install isc-dhcp-server man python3 \
10+
&& apt-get -q -y -o "DPkg::Options::=--force-confold" -o "DPkg::Options::=--force-confdef" install isc-dhcp-server man \
1111
&& apt-get -q -y autoremove \
1212
&& apt-get -q -y clean \
1313
&& rm -rf /var/lib/apt/lists/*
1414

15-
COPY util/my_init.py /sbin/my_init
15+
COPY util/dumb-init_1.2.0_amd64 /usr/bin/dumb-init
1616
COPY util/entrypoint.sh /entrypoint.sh
1717
ENTRYPOINT ["/entrypoint.sh"]

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ This image uses the following software components:
5555

5656
* Ubuntu Linux distribution from <https://www.ubuntu.com>.
5757
* ISC DHCP server from <https://www.isc.org/downloads/dhcp/>.
58-
* Docker-optimized my_init from <https://github.com/phusion/baseimage-docker>.
58+
* Dumb-init from <https://github.com/Yelp/dumb-init>.
5959

6060
Copyright & License
6161
===================
6262

63-
This project is copyright 2016 Robin Smidsrød <[email protected]>.
63+
This project is copyright 2017 Robin Smidsrød <[email protected]>.
6464

6565
It is licensed under the Apache 2.0 license.
6666

util/dumb-init_1.2.0_amd64

45.3 KB
Binary file not shown.

util/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [ -z "$1" ]; then
1313
IFACE=" "
1414
fi
1515

16-
init="/sbin/my_init --skip-startup-files --skip-runit"
16+
init="/usr/bin/dumb-init"
1717

1818
if [ -n "$IFACE" ]; then
1919
# Run dhcpd for specified interface or all interfaces

util/my_init.py

Lines changed: 0 additions & 352 deletions
This file was deleted.

0 commit comments

Comments
 (0)