From b51c13926495d1b17b0ee39c1dbbf03d330762a1 Mon Sep 17 00:00:00 2001 From: jamesread Date: Thu, 29 Sep 2022 02:21:53 +0200 Subject: [PATCH] feature: Switched to fedora-minimal --- Dockerfile | 10 ++++------ Dockerfile.arm64 | 10 ++++------ Dockerfile.armv7 | 10 ++++------ 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1decbc9..f0660d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,13 @@ -FROM --platform=linux/amd64 docker.io/amd64/fedora +FROM --platform=linux/amd64 registry.fedoraproject.org/fedora-minimal:36-x86_64 -RUN useradd -rm olivetin -u 1000 +RUN useradd --system --create-home olivetin -u 1000 RUN mkdir -p /config /var/www/olivetin \ && \ - dnf install -y \ + microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ iputils \ openssh-clients \ - docker \ - && dnf clean all && \ - rm -rf /var/cache/dnf + docker EXPOSE 1337/tcp diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 20b21f1..22c2b55 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,14 +1,12 @@ -FROM --platform=linux/arm64 docker.io/arm64v8/fedora +FROM --platform=linux/arm64 registry.fedoraproject.org/fedora-minimal:36-aarch64 -RUN useradd -rm olivetin -u 1000 +RUN useradd --system --create-home olivetin -u 1000 RUN mkdir -p /config /var/www/olivetin \ && \ - dnf install -y \ + microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ iputils \ - openssh-clients \ - && dnf clean all && \ - rm -rf /var/cache/dnf + openssh-clients EXPOSE 1337/tcp diff --git a/Dockerfile.armv7 b/Dockerfile.armv7 index eac155e..0d1ef73 100644 --- a/Dockerfile.armv7 +++ b/Dockerfile.armv7 @@ -1,14 +1,12 @@ -FROM --platform=linux/arm/v7 arm32v7/fedora:latest +FROM --platform=linux/arm/v7 registry.fedoraproject.org/fedora-minimal:36-armhfp -RUN useradd -rm olivetin -u 1000 +RUN useradd --system --create-home olivetin -u 1000 RUN mkdir -p /config /var/www/olivetin \ && \ - dnf install -y \ + microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ iputils \ - openssh-clients \ - && dnf clean all && \ - rm -rf /var/cache/dnf + openssh-clients EXPOSE 1337/tcp