From 5e0fd1a8d8a3c420637f751b728d5db74f81141e Mon Sep 17 00:00:00 2001
From: Marvin Zhang <tikazyq@163.com>
Date: Sun, 24 Nov 2024 17:47:29 +0800
Subject: [PATCH] ci: updated dockerfile

---
 Dockerfile                          |  25 +++++++------------------
 docker/bin/docker-init.sh           |  10 ++++++++--
 docker/ghcr/.docker-compose.yml.swp | Bin 12288 -> 0 bytes
 docker/ghcr/docker-compose.yml      |  14 ++------------
 4 files changed, 17 insertions(+), 32 deletions(-)
 delete mode 100644 docker/ghcr/.docker-compose.yml.swp

diff --git a/Dockerfile b/Dockerfile
index c60dfaa6..f9aec9f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,30 +6,19 @@ FROM crawlabteam/crawlab-frontend:${CRAWLAB_TAG} AS frontend-build
 
 FROM crawlabteam/crawlab-base:${CRAWLAB_TAG}
 
-# copy backend files
-RUN mkdir -p /opt/bin
-COPY --from=backend-build /go/bin/crawlab /opt/bin
-RUN cp /opt/bin/crawlab /usr/local/bin/crawlab-server
-
-# copy backend config files
-COPY ./backend/conf /app/backend/conf
-
-# copy frontend files
+# Copy files
+COPY --from=backend-build /go/bin/crawlab /usr/local/bin/crawlab-server
 COPY --from=frontend-build /app/dist /app/dist
-
-# copy nginx config files
+COPY ./backend/conf /app/backend/conf
 COPY ./docker/nginx/crawlab.conf /etc/nginx/conf.d
+COPY ./docker/bin/docker-init.sh /app/bin/docker-init.sh
 
-# copy docker bin files
-RUN mkdir -p /app/bin
-COPY ./docker/bin/* /app/bin
-
-# start backend
+# Start backend
 CMD ["/bin/bash", "/app/bin/docker-init.sh"]
 
-# frontend port
+# Frontend port
 EXPOSE 8080
 
-# healthcheck for backend
+# Healthcheck for backend
 HEALTHCHECK --interval=1m --timeout=3s \
   CMD curl -f http://localhost:8000/health || exit 1
\ No newline at end of file
diff --git a/docker/bin/docker-init.sh b/docker/bin/docker-init.sh
index 3f49f824..ed6a9d05 100644
--- a/docker/bin/docker-init.sh
+++ b/docker/bin/docker-init.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
 
-# replace default api path to new one
-python /app/bin/update_docker_js_api_address.py
+if [ "${CRAWLAB_MASTER_NODE}" == "Y" ]; then
+    # Replace default api path to new one
+    python /app/bin/update_docker_js_api_address.py
 
+    # Start nginx
+    service nginx start
+fi
+
+# Start backend
 crawlab-server server
diff --git a/docker/ghcr/.docker-compose.yml.swp b/docker/ghcr/.docker-compose.yml.swp
deleted file mode 100644
index fe323879a0e928ad1fab18720227ced2d297c720..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2J#W)M7{{-uBZUeU#=}MGf@7BmDR@g?RFFth+5&<KMHl;sO>LibzN7*KUHAsD
zcHmnu@DX4{Oh`<;ZAffg_&atYNJR%&Ks+b?a=sToXaDXpM0vXIjVmpFspc}2S;k)O
zFZPz7A535CGL{HEco2%TSBxD|T9_B5x!n@}qEb8dx>mJV`68aU=kYk8lWBEN`X+aL
zEp}tkwT%?XxPeipEBqaq2BSVFP-ttX7y7!owtbakDwnnU$>d5C3saK}kO3H&Vf70O
z!>{_Bb(Wt#b)Bq`0Wv@a$N(8217v^<kO4CA9~m&&6x+l59;@Ejs_LnUx@uBI2FL&z
zAOmE843GgbKnBPF86X2>fDHVD21LM^eVnn^p!olP^!xwoNya{ccVHj%K>$|395@4}
z!M78PeE@I3Q?LhOunlg5bubG)%`o;Bya3O@6VL|%u)qm$fM@suK7;q5c&1l?3K<{+
zWPl8i0Wv@a$N(8217zTk0ge(Sq9;9`sI;fNi;P!S3|B?b(&$L$9xsN9VxmN<zVY~i
zo3mjLk5VJ`K*S!ekNb?wF=yLaYAsvmx#jnDT-5g6;xjZR^BiZG^BgKnY`CuLgi^#N
zwC)U}mJL6Y{*G5IWAjAhSZUY{WQJ_#yra_5@X|)}=GEq6r`6otTG{AaZf|aR+$wLe
zst}_&YwhKgY9i*WmBTU}L|UbZOidZnSE&(EDs?9n2^>|q*PSA#y0fb^@~ek&D}_aO
zEmETl?4MG!y>kyoYi~7IJv)#C8LR9O?k@v*f2Z)`RQ$rX&8>#paItp{w-lHuZSq6g
v(Oz3^k9VVpcl2i5`kl@A;b8pPW|V<Emg7K2KF&QGNS#MGWqiI~tIxCV85};^

diff --git a/docker/ghcr/docker-compose.yml b/docker/ghcr/docker-compose.yml
index 8cf732c7..d135a326 100644
--- a/docker/ghcr/docker-compose.yml
+++ b/docker/ghcr/docker-compose.yml
@@ -10,12 +10,7 @@ services:
       - "8080:8080"
     depends_on:
       - mongo
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-
+    
   worker:
     image: ghcr.io/crawlab-team/crawlab:${CRAWLAB_TAG:-develop}
     container_name: crawlab_ghcr_worker
@@ -24,11 +19,6 @@ services:
       CRAWLAB_MASTER_HOST: "master"
     depends_on:
       - master
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-
+    
   mongo:
     image: mongo:5