整理软件归类

Author: ghostry

desktop/arch/kde/Dockerfile

@@ -14,22 +14,21 @@ RUN pacman -Syyu --noconfirm \
     && pacman -Scc --noconfirm \
     && rm -rf /var/cache/pacman/pkg/*
 
-RUN \
-  echo "**** add icon ****" && \
-  curl -o \
-    /kclient/public/icon.png \
-    https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
-  echo "**** install packages ****" && \
-  pacman -Sy --noconfirm --needed \
-    chromium \
-    dolphin \
+COPY desktop/arch/kde/root/webtop-logo.png /kclient/public/icon.png
+
+RUN pacman -Sy --noconfirm --needed \
+    kwin-x11 plasma-desktop && \
+  echo "**** cleanup ****" && \
+  rm -rf \
+    /config/.cache \
+    /tmp/* \
+    /var/cache/pacman/pkg/* \
+    /var/lib/pacman/sync/*
+
+RUN pacman -Sy --noconfirm --needed \
+    dolphin ark dolphin-plugins unarchiver \
     kate \
-    konsole \
-    plasma-desktop && \
-  echo "**** application tweaks ****" && \
-  sed -i \
-    's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
-    /usr/share/applications/chromium.desktop && \
+    konsole && \
   echo "**** kde tweaks ****" && \
   sed -i \
     's/applications:org.kde.discover.desktop,/applications:org.kde.konsole.desktop,/g' \
@@ -41,6 +40,19 @@ RUN \
     /var/cache/pacman/pkg/* \
     /var/lib/pacman/sync/*
 
+RUN pacman -Sy --noconfirm --needed \
+    chromium && \
+  echo "**** application tweaks ****" && \
+  sed -i \
+    's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
+    /usr/share/applications/chromium.desktop && \
+  echo "**** cleanup ****" && \
+  rm -rf \
+    /config/.cache \
+    /tmp/* \
+    /var/cache/pacman/pkg/* \
+    /var/lib/pacman/sync/*
+
 # add local files
 COPY desktop/arch/kde/root /
 RUN chmod 755 /defaults/startwm.sh && chmod 755 /usr/local/bin/wrapped-chromium
@@ -67,10 +79,9 @@ RUN echo '[archlinuxcn]' >> /etc/pacman.conf && \
 # 安装基础包
 RUN pacman -Sy --noconfirm \
         git base-devel sudo yay sshpass \
-        vim htop iotop iftop fuse2 \
+        vim htop iotop iftop \
         iputils net-tools dnsutils \
-        bash-completion unarchiver \
-        ark dolphin-plugins kwin-x11 \
+        zsh  \
     && pacman -Scc --noconfirm \
     && rm -rf /var/cache/pacman/pkg/*