From d0da63b5ef54d930283c8abd14e94eb2822c0855 Mon Sep 17 00:00:00 2001
From: Christopher Schnick <crschnick@xpipe.io>
Date: Mon, 16 Sep 2024 09:40:15 +0200
Subject: [PATCH] Restructure dockerfile

---
 Dockerfile | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 685c4cb..070289d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,7 @@ ARG DEBIAN_FRONTEND="noninteractive"
 # title
 ENV TITLE="XPipe Webtop"
 ARG XPIPE_VERSION="11.3"
+ARG XPIPE_REPOSITORY="xpipe-io/xpipe"
 
 # prevent Ubuntu's firefox stub from being installed
 COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
@@ -36,6 +37,7 @@ RUN  echo "**** install packages ****" && \
     kwin-x11 \
     kwrite \
     wget \
+     git \
     plasma-desktop \
     plasma-workspace \
     plymouth-theme-kubuntu-logo \
@@ -46,17 +48,19 @@ RUN  echo "**** install packages ****" && \
     kate \
     gedit \
     terminator \
-    systemsettings
-
-RUN echo "**** XPipe ****" && \
-  wget "https://github.com/xpipe-io/xpipe/releases/download/$XPIPE_VERSION/xpipe-installer-linux-x86_64.deb" && \
-  DEBIAN_FRONTEND=noninteractive \
-  apt-get install --no-install-recommends -y "./xpipe-installer-linux-x86_64.deb" && \
-  rm "./xpipe-installer-linux-x86_64.deb"
+    systemsettings && \
+ apt-get autoclean && \
+ rm -rf \
+   /config/.cache \
+   /config/.launchpadlib \
+   /var/lib/apt/lists/* \
+   /var/tmp/* \
+   /tmp/*
 
 RUN echo "**** VsCode ****" && \
   wget -O vscode.deb "https://go.microsoft.com/fwlink/?LinkID=760868" && \
   DEBIAN_FRONTEND=noninteractive \
+  apt-get update && \
   apt-get install --no-install-recommends -y "./vscode.deb" && \
   rm "./vscode.deb"
 
@@ -65,19 +69,17 @@ RUN  echo "**** kde tweaks ****" && \
     's/applications:org.kde.discover.desktop,/applications:org.kde.konsole.desktop,/g' \
     /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml
 
-RUN echo "**** cleanup ****" && \
-  apt-get autoclean && \
-  rm -rf \
-    /config/.cache \
-    /config/.launchpadlib \
-    /var/lib/apt/lists/* \
-    /var/tmp/* \
-    /tmp/*
-
-RUN mkdir -p "/config/.config/kdedefaults/autostart/" && ln -s "/usr/share/applications/xpipe.desktop" "/config/.config/kdedefaults/autostart/xpipe.desktop"
-
 # add local files
 COPY /root /
 
 # ports and volumes
 VOLUME /config
+
+RUN echo "**** XPipe ****" && \
+  wget "https://github.com/$XPIPE_REPOSITORY/releases/download/$XPIPE_VERSION/xpipe-installer-linux-x86_64.deb" && \
+  DEBIAN_FRONTEND=noninteractive \
+  apt-get update && \
+  apt-get install --no-install-recommends -y "./xpipe-installer-linux-x86_64.deb" && \
+  rm "./xpipe-installer-linux-x86_64.deb"
+
+RUN mkdir -p "/config/.config/kdedefaults/autostart/" && ln -s "/usr/share/applications/xpipe.desktop" "/config/.config/kdedefaults/autostart/xpipe.desktop"