From 95c589478d0ee8941cdd8e5b3813f2f7d84103dd Mon Sep 17 00:00:00 2001 From: jamesread Date: Thu, 29 Sep 2022 08:46:59 +0100 Subject: [PATCH 1/2] cicd: need shadow-utils for useradd --- Dockerfile | 1 + Dockerfile.arm64 | 1 + Dockerfile.armv7 | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index f0660d5..a7bf212 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ RUN mkdir -p /config /var/www/olivetin \ microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ iputils \ openssh-clients \ + shadow-utils \ docker EXPOSE 1337/tcp diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 22c2b55..8efbbd5 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -6,6 +6,7 @@ RUN mkdir -p /config /var/www/olivetin \ && \ microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ iputils \ + shadow-utils \ openssh-clients EXPOSE 1337/tcp diff --git a/Dockerfile.armv7 b/Dockerfile.armv7 index 0d1ef73..78a636b 100644 --- a/Dockerfile.armv7 +++ b/Dockerfile.armv7 @@ -6,6 +6,7 @@ RUN mkdir -p /config /var/www/olivetin \ && \ microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ iputils \ + shadow-utils \ openssh-clients EXPOSE 1337/tcp From 770c6c06bfcc30ef549c3376f6fc5034ddd1d3ee Mon Sep 17 00:00:00 2001 From: jamesread Date: Thu, 29 Sep 2022 08:57:16 +0100 Subject: [PATCH 2/2] cicd: useradd after installing it --- Dockerfile | 4 ++-- Dockerfile.arm64 | 4 ++-- Dockerfile.armv7 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index a7bf212..815279f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,5 @@ FROM --platform=linux/amd64 registry.fedoraproject.org/fedora-minimal:36-x86_64 -RUN useradd --system --create-home olivetin -u 1000 - RUN mkdir -p /config /var/www/olivetin \ && \ microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ @@ -10,6 +8,8 @@ RUN mkdir -p /config /var/www/olivetin \ shadow-utils \ docker +RUN useradd --system --create-home olivetin -u 1000 + EXPOSE 1337/tcp VOLUME /config diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 8efbbd5..e80041a 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,7 +1,5 @@ FROM --platform=linux/arm64 registry.fedoraproject.org/fedora-minimal:36-aarch64 -RUN useradd --system --create-home olivetin -u 1000 - RUN mkdir -p /config /var/www/olivetin \ && \ microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ @@ -9,6 +7,8 @@ RUN mkdir -p /config /var/www/olivetin \ shadow-utils \ openssh-clients +RUN useradd --system --create-home olivetin -u 1000 + EXPOSE 1337/tcp VOLUME /config diff --git a/Dockerfile.armv7 b/Dockerfile.armv7 index 78a636b..9d88446 100644 --- a/Dockerfile.armv7 +++ b/Dockerfile.armv7 @@ -1,7 +1,5 @@ FROM --platform=linux/arm/v7 registry.fedoraproject.org/fedora-minimal:36-armhfp -RUN useradd --system --create-home olivetin -u 1000 - RUN mkdir -p /config /var/www/olivetin \ && \ microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ @@ -9,6 +7,8 @@ RUN mkdir -p /config /var/www/olivetin \ shadow-utils \ openssh-clients +RUN useradd --system --create-home olivetin -u 1000 + EXPOSE 1337/tcp VOLUME /config