From 7afb2af594f9f11a4802f8132d7ff30bf103948a Mon Sep 17 00:00:00 2001
From: Evan Chen <evanchen@kumoly.io>
Date: Thu, 18 Nov 2021 01:10:20 +0800
Subject: [PATCH] update

---
 Dockerfile | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a520f2f..e654a92 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,6 @@ FROM golang:1.17.2
 
 WORKDIR /src
 
-RUN touch shell.sh
-
 RUN \
 # gterm \
 curl -fsSL https://kumoly.io/attachments/e4bdde2a-4247-446f-a734-df3962c8b83b | tar -C /usr/local/bin/ -xz &&\
@@ -11,36 +9,33 @@ curl -fsSL https://kumoly.io/attachments/e4bdde2a-4247-446f-a734-df3962c8b83b |
 curl -fsSL https://kumoly.io/attachments/9994192c-eca8-481c-bdb9-3d9f440c5c53 | tar -C /usr/local/bin/ -xz &&\
 curl -fsSL https://github.com/caddyserver/caddy/releases/download/v2.4.6/caddy_2.4.6_linux_amd64.tar.gz | tar -C /usr/local/bin/ -xz
 
-RUN echo '#!/bin/bash\n\
+RUN touch shell.sh && \
+echo '#!/bin/bash\n\
 echo "starting shell service..."\n\
-gterm -addr :8080 -name GoPlayground -arg "--rcfile" -arg <(gterm -profile) &\n\
+cd /root && gterm -addr :8080 -name GoPlayground -arg "--rcfile" -arg <(gterm -profile) &\n\
 echo "starting configui..."\n\
 configui -log configui.log -f conf.json -bind :8001 &\n\
 caddy run --config Caddyfile\n\
-' > /entrypoint.sh
-
-RUN echo '\
+' > /entrypoint.sh && \
+echo '\
 :8000 {\n\
     route /sh/* {\n\
         uri strip_prefix /sh\n\
         reverse_proxy  localhost:8080\n\
     }\n\
     reverse_proxy  localhost:8001\n\
-}' > Caddyfile
-
-RUN echo '\
+}' > Caddyfile && \
+echo '\
 {{ define "links" }}\n\
 <a class="button is-white level-item" \n\
   href="sh/"\n\
 >Shell</a>\n\
 {{end}}\n\
-' > links.tmpl
-
-RUN echo '{"app_name":"Go Playground","no_reconfig":true \
+' > links.tmpl && \
+echo '{"app_name":"Go Playground","no_reconfig":true \
 ,"files":[{"path":"main.go","name":"Main","action":"go run main.go","order":-1},{"path":"shell.sh","name":"Shell","action":"bash shell.sh","order":1}] \
-,"hide_config":true,"cust":"."}' > conf.json
-
-RUN echo 'package main\n\
+,"hide_config":true,"cust":"."}' > conf.json && \
+echo 'package main\n\
 \n\
 import "fmt"\n\
 \n\
@@ -48,5 +43,4 @@ func main() {\n\
 	fmt.Println("Hello, world.")\n\
 }\n' > main.go
 
-
 ENTRYPOINT ["/bin/bash","/entrypoint.sh"]