Dockerfiles: Replace deprecated "maintainer" label

Also, do the `dnf install` in one step, not in three.
This commit is contained in:
Brian Cunnie
2022-04-22 08:11:21 -07:00
parent 8d55c534fc
commit 1fc970a87e
4 changed files with 14 additions and 8 deletions

View File

@@ -16,13 +16,19 @@
# #
FROM fedora AS sslip.io-nginx FROM fedora AS sslip.io-nginx
LABEL maintainer="brian.cunnie@gmail.com" LABEL org.opencontainers.image.authors="Brian Cunnie <brian.cunnie@gmail.com>"
RUN dnf install -y iproute bind-utils neovim RUN dnf install -y \
bind-utils \
iproute \
less \
lsof \
neovim \
net-tools \
nginx \
nmap-ncat \
procps-ng \
RUN dnf install -y procps-ng nmap-ncat net-tools lsof less
RUN dnf install -y nginx
RUN mv /usr/share/nginx/html /usr/share/nginx/html-orig RUN mv /usr/share/nginx/html /usr/share/nginx/html-orig

View File

@@ -6,7 +6,7 @@
# Much was from here: <https://goglides.io/manage-ntp-using-kubernetes/90/> # Much was from here: <https://goglides.io/manage-ntp-using-kubernetes/90/>
FROM alpine:3.11.3 AS sslip.io-ntp FROM alpine:3.11.3 AS sslip.io-ntp
LABEL maintainer="brian.cunnie@gmail.com" LABEL org.opencontainers.image.authors="Brian Cunnie <brian.cunnie@gmail.com>"
RUN apk update RUN apk update
RUN apk add openntpd RUN apk add openntpd
RUN mkdir -m 1777 /var/empty/tmp RUN mkdir -m 1777 /var/empty/tmp

View File

@@ -21,7 +21,7 @@
# #
FROM alpine AS sslip.io FROM alpine AS sslip.io
LABEL maintainer="brian.cunnie@gmail.com" LABEL org.opencontainers.image.authors="Brian Cunnie <brian.cunnie@gmail.com>"
RUN apk update && apk add bind-tools RUN apk update && apk add bind-tools

View File

@@ -39,7 +39,7 @@
FROM alpine AS sslip.io FROM alpine AS sslip.io
LABEL maintainer="brian.cunnie@gmail.com" LABEL org.opencontainers.image.authors="Brian Cunnie <brian.cunnie@gmail.com>"
COPY wildcard-dns-http-server /usr/sbin/wildcard-dns-http-server COPY wildcard-dns-http-server /usr/sbin/wildcard-dns-http-server