From 9243a3b96e67daae258831601c870d145284249c Mon Sep 17 00:00:00 2001
From: ModerRAS <adqewsx@gmail.com>
Date: Sun, 2 Apr 2023 04:06:29 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=BF=AE=E6=94=B9=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a71e58a496c4368d642f5d3df1c6240f6f09580e.
---
 Dockerfile  | 11 ++++++++++-
 Jenkinsfile |  1 -
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f6ff4ed..72305a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,2 +1,11 @@
+FROM ghcr.io/pengx17/logseq-publish as build
+WORKDIR /home/logseq
+ENV LOGSEQ_SRC=/home/logseq/graph 
+ENV LOGSEQ_DEST=output
+ENV LOGSEQ_IS_TRACE=false
+ENV LOGSEQ_THEME=dark
+COPY . /home/logseq/graph 
+RUN bash entrypoint.sh
+
 FROM nginx
-COPY ./www /usr/share/nginx/html
\ No newline at end of file
+COPY --from=build /home/logseq/graph/output /usr/share/nginx/html
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index e458088..8db990b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,7 +6,6 @@ pipeline {
         version = "1.0.${env.BUILD_NUMBER}"
       }
       steps {
-        sh 'docker run -d -i  --name LogSeqPublishContainer --rm -v $PWD:/home/logseq/graph -w /home/logseq ghcr.io/unickcheng/logseq-publish:latest'
         sh 'docker build --no-cache -t registry.miaostay.com/kotadoc -f Dockerfile .'
       }
     }