瀏覽代碼

feature: Switched to fedora-minimal

jamesread 3 年之前
父節點
當前提交
b51c139264
共有 3 個文件被更改,包括 12 次插入18 次删除
  1. 4 6
      Dockerfile
  2. 4 6
      Dockerfile.arm64
  3. 4 6
      Dockerfile.armv7

+ 4 - 6
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 \
 RUN mkdir -p /config /var/www/olivetin \
     && \
     && \
-    dnf install -y \ 
+    microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ 
 		iputils \
 		iputils \
 		openssh-clients \
 		openssh-clients \
-		docker \
-    && dnf clean all && \
-    rm -rf /var/cache/dnf 
+		docker 
 
 
 EXPOSE 1337/tcp 
 EXPOSE 1337/tcp 
 
 

+ 4 - 6
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 \
 RUN mkdir -p /config /var/www/olivetin \
     && \
     && \
-    dnf install -y \ 
+    microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ 
 		iputils \
 		iputils \
-		openssh-clients \
-    && dnf clean all && \
-    rm -rf /var/cache/dnf
+		openssh-clients 
 
 
 EXPOSE 1337/tcp 
 EXPOSE 1337/tcp 
 
 

+ 4 - 6
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 \
 RUN mkdir -p /config /var/www/olivetin \
     && \
     && \
-    dnf install -y \ 
+    microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ 
 		iputils \
 		iputils \
-		openssh-clients \
-    && dnf clean all && \
-    rm -rf /var/cache/dnf 
+		openssh-clients 
 
 
 EXPOSE 1337/tcp 
 EXPOSE 1337/tcp