Skip to content

Commit 139726c

Browse files
committed
Make 'man dhcpd.conf' work again, after Ubuntu 'minimize' on base image
Various tweaks to Dockerfile to modernize it.
1 parent 3a79de5 commit 139726c

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

Dockerfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
FROM ubuntu:20.04
22

3-
MAINTAINER Robin Smidsrød <robin@smidsrod.no>
3+
LABEL org.opencontainers.image.authors="Robin Smidsrød <robin@smidsrod.no>"
44

55
ARG DEBIAN_FRONTEND=noninteractive
66

7+
RUN yes | unminimize
8+
79
RUN apt-get -q -y update \
8-
&& apt-get -q -y -o "DPkg::Options::=--force-confold" -o "DPkg::Options::=--force-confdef" install apt-utils \
9-
&& rm /etc/dpkg/dpkg.cfg.d/excludes \
10-
&& apt-get -q -y -o "DPkg::Options::=--force-confold" -o "DPkg::Options::=--force-confdef" install dumb-init isc-dhcp-server man \
10+
&& apt-get -q -y -o "DPkg::Options::=--force-confold" -o "DPkg::Options::=--force-confdef" install \
11+
apt-utils dumb-init isc-dhcp-server man \
1112
&& apt-get -q -y autoremove \
1213
&& apt-get -q -y clean \
1314
&& rm -rf /var/lib/apt/lists/*

Dockerfile.ldap

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22

3-
MAINTAINER Robin Smidsrød <robin@smidsrod.no>
3+
LABEL org.opencontainers.image.authors="Robin Smidsrød <robin@smidsrod.no>"
44

55
ARG DEBIAN_FRONTEND=noninteractive
66

7+
RUN yes | unminimize
8+
79
RUN apt-get -q -y update \
8-
&& apt-get -q -y -o "DPkg::Options::=--force-confold" -o "DPkg::Options::=--force-confdef" install apt-utils \
9-
&& rm /etc/dpkg/dpkg.cfg.d/excludes \
10-
&& apt-get -q -y -o "DPkg::Options::=--force-confold" -o "DPkg::Options::=--force-confdef" install dumb-init isc-dhcp-server-ldap man \
10+
&& apt-get -q -y -o "DPkg::Options::=--force-confold" -o "DPkg::Options::=--force-confdef" install \
11+
apt-utils dumb-init isc-dhcp-server-ldap man \
1112
&& apt-get -q -y autoremove \
1213
&& apt-get -q -y clean \
1314
&& rm -rf /var/lib/apt/lists/*

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ This image uses the following software components:
7474
Copyright & License
7575
===================
7676

77-
This project is copyright 2017 Robin Smidsrød <robin@smidsrod.no>.
77+
This project is copyright 2022 Robin Smidsrød <robin@smidsrod.no>.
7878

7979
It is licensed under the Apache 2.0 license.
8080

0 commit comments

Comments
 (0)