From 03ce4056fadb6f1f44774278b9c33f33a4939499 Mon Sep 17 00:00:00 2001
From: Chara White <chara@chara.pub>
Date: Mon, 10 Jun 2024 15:04:24 +0800
Subject: [PATCH] flat docker image

---
 Dockerfile | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5a1f752..e079cd0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,6 +27,8 @@ HOMEPAGE="https://app.getgrass.io/" \
 EXTRA_CHROME_OPTS="" \
 EXTRA_COMMAND="exit 0"
 
+COPY assets/ /
+
 RUN	sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories && \
 	apk update && \
 	apk add --no-cache tzdata ca-certificates supervisor curl wget openssl bash sed unzip xvfb x11vnc websockify openbox chromium nss alsa-lib font-noto font-noto-cjk openssh sshpass jq && \
@@ -34,17 +36,13 @@ RUN	sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/re
 	openssl req -new -newkey rsa:4096 -days 36500 -nodes -x509 -subj "/C=IN/O=Dis/CN=www.google.com" -keyout /etc/ssl/novnc.key -out /etc/ssl/novnc.cert > /dev/null 2>&1 && \
 # TimeZone
 	cp /usr/share/zoneinfo/$TZ /etc/localtime && \
-	echo $TZ > /etc/timezone
-
-COPY assets/ /
-
+	echo $TZ > /etc/timezone && \
 # get grass extension
-RUN sh /scripts/getgrass.sh
-
+	sh /scripts/getgrass.sh && \
 # Wipe Temp Files
 # Don't delete curl,wget,jq,unzip as they are used in scripts
 # keep ssh, sshpass for ssh tunneling(user custom usage)
-RUN apk del openssl build-base && \
+	apk del openssl build-base && \
 	rm -rf /var/cache/apk/* /tmp/* /extension
 
 ENTRYPOINT ["supervisord", "-l", "/var/log/supervisord.log", "-c"]