From 237ad0ea698f15b06230383b0693075867beb66f Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Mon, 13 May 2024 01:17:30 +0200
Subject: [PATCH] build: Optimize Dockerfile

---
 Dockerfile | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8365423..f760d83 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,20 @@
 FROM debian:trixie-slim
 
+ARG VERSION_ARG "0.0"
+ARG VERSION_VNC "1.4.0"
+
 ARG DEBCONF_NOWARNINGS "yes"
 ARG DEBIAN_FRONTEND "noninteractive"
 ARG DEBCONF_NONINTERACTIVE_SEEN "true"
 
-RUN apt-get update && \
+RUN echo "$VERSION_ARG" > /run/version && \
+    apt-get update && \
     apt-get --no-install-recommends -y install \
         tini \
         wget \
         nginx \
         procps \
-        seabios \        
+        seabios \
         iptables \
         iproute2 \
         apt-utils \
@@ -22,24 +26,22 @@ RUN apt-get update && \
         qemu-system-arm \
         qemu-efi-aarch64 && \
     apt-get clean && \
-    novnc="1.4.0" && \
     mkdir -p /usr/share/novnc && \
-    wget https://github.com/novnc/noVNC/archive/refs/tags/v"$novnc".tar.gz -O /tmp/novnc.tar.gz -q && \
+    wget https://github.com/novnc/noVNC/archive/refs/tags/v"$VERSION_VNC".tar.gz -O /tmp/novnc.tar.gz -q && \
     tar -xf /tmp/novnc.tar.gz -C /tmp/ && \
-    cd /tmp/noVNC-"$novnc" && \
+    cd /tmp/noVNC-"$VERSION_VNC" && \
     mv app core vendor package.json *.html /usr/share/novnc && \
     unlink /etc/nginx/sites-enabled/default && \
     sed -i 's/^worker_processes.*/worker_processes 1;/' /etc/nginx/nginx.conf && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-ADD https://raw.githubusercontent.com/qemus/qemu-docker/master/web/index.html /var/www/index.html
-ADD https://raw.githubusercontent.com/qemus/qemu-docker/master/web/js/script.js /var/www/js/script.js
-ADD https://raw.githubusercontent.com/qemus/qemu-docker/master/web/css/style.css /var/www/css/style.css
-ADD https://raw.githubusercontent.com/qemus/qemu-docker/master/web/img/favicon.svg /var/www/img/favicon.svg
-ADD https://raw.githubusercontent.com/qemus/qemu-docker/master/web/nginx.conf /etc/nginx/sites-enabled/web.conf
+COPY --chmod=755 ./src /run/
 
-COPY ./src /run/
-RUN chmod +x /run/*.sh && chmod 755 -R /var/www/
+ADD --chmod=644 https://raw.githubusercontent.com/qemus/qemu-docker/master/web/index.html /var/www/index.html
+ADD --chmod=644 https://raw.githubusercontent.com/qemus/qemu-docker/master/web/js/script.js /var/www/js/script.js
+ADD --chmod=644 https://raw.githubusercontent.com/qemus/qemu-docker/master/web/css/style.css /var/www/css/style.css
+ADD --chmod=644 https://raw.githubusercontent.com/qemus/qemu-docker/master/web/img/favicon.svg /var/www/img/favicon.svg
+ADD --chmod=744 https://raw.githubusercontent.com/qemus/qemu-docker/master/web/nginx.conf /etc/nginx/sites-enabled/web.conf
 
 VOLUME /storage
 EXPOSE 22 5900 8006
@@ -49,7 +51,4 @@ ENV RAM_SIZE "1G"
 ENV DISK_SIZE "16G"
 ENV BOOT "http://example.com/image.iso"
 
-ARG VERSION_ARG "0.0"
-RUN echo "$VERSION_ARG" > /run/version
-
 ENTRYPOINT ["/usr/bin/tini", "-s", "/run/entry.sh"]