From 8a3f233dffee41191639f985f920ee84a1bd9109 Mon Sep 17 00:00:00 2001
From: Albrecht Lohofener <albrechtloh@gmx.de>
Date: Sun, 17 Nov 2024 23:13:20 +0100
Subject: [PATCH] Remove unused image version number

---
 Dockerfile            | 7 ++-----
 src/init_container.sh | 8 +++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b9ebb63..50eabdf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,6 @@ FROM alpine:latest
 
 ARG NOVNC_VERSION="1.5.0" 
 ARG OPENWRT_VERSION="23.05.5"
-ARG VERSION_ARG="0.1"
 ARG TARGETPLATFORM
 ARG OPENWRT_ROOTFS_IMG
 ARG OPENWRT_KERNEL
@@ -181,7 +180,8 @@ RUN echo "Building for platform '$TARGETPLATFORM'" \
     && echo "OPENWRT_VERSION=\"${OPENWRT_VERSION}\"" > /var/vm/openwrt_metadata.conf \
     && echo "OPENWRT_IMAGE_CREATE_DATETIME=\"`date`\"" >> /var/vm/openwrt_metadata.conf \
     && echo "OPENWRT_IMAGE_ID=\"`uuidgen`\"" >> /var/vm/openwrt_metadata.conf \
-    && echo "OPENWRT_CPU_ARCH=\"${TARGETPLATFORM}\"" >> /var/vm/openwrt_metadata.conf
+    && echo "OPENWRT_CPU_ARCH=\"${TARGETPLATFORM}\"" >> /var/vm/openwrt_metadata.conf \
+    && echo "CONTAINER_CREATE_DATETIME=\"`date`\"" >> /var/vm/openwrt_metadata.conf
 
 COPY --from=builder /usr/local/bin/qemu-openwrt-web-backend /usr/local/bin/qemu-openwrt-web-backend
 COPY ./src /run/
@@ -194,9 +194,6 @@ EXPOSE 8006
 EXPOSE 8000
 EXPOSE 8022
 
-RUN echo "$VERSION_ARG" > /run/version \
-    && echo "CONTAINER_CREATE_DATETIME=\"`date`\"" >> /var/vm/openwrt_metadata.conf
-
 HEALTHCHECK --start-period=10m CMD /run/healthcheck.sh
 
 CMD ["/run/init_container.sh"]
\ No newline at end of file
diff --git a/src/init_container.sh b/src/init_container.sh
index cb805e2..d8ef742 100644
--- a/src/init_container.sh
+++ b/src/init_container.sh
@@ -1,16 +1,14 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
+. /var/vm/openwrt_metadata.conf
 . /run/helpers.sh
 
 [ ! -f "/run/init_container.sh" ] && error "Script must run inside Docker container!" && exit 11
 [ "$(id -u)" -ne "0" ] && error "Script must be executed with root privileges." && exit 12
 
-APP="OpenWrt"
-SUPPORT="https://github.com/AlbrechtL/openwrt-docker"
-
-echo "❯ Starting $APP for Docker v$(</run/version)..."
-echo "❯ For support visit $SUPPORT"
+echo "❯ Starting OpenWrt $OPENWRT_VERSION for Docker ..."
+echo "❯ For support visit https://github.com/AlbrechtL/openwrt-docker"
 echo
 
 # Show alpine version