Merge pull request #1109 from crawlab-team/develop

Develop

.github/workflows/dockerpush.yml

@@ -43,3 +43,8 @@ jobs:
 
         docker tag image $IMAGE_ID:$VERSION
         docker push $IMAGE_ID:$VERSION
+
+        if [[ $VERSION == "latest" ]]; then
+          docker tag image $IMAGE_ID:main
+          docker push $IMAGE_ID:main
+        fi

Dockerfile

@@ -19,7 +19,7 @@ RUN rm /app/.npmrc
 RUN yarn install && yarn run build:docker
 
 # images
-FROM ubuntu:latest
+FROM ubuntu:20.04
 
 # set as non-interactive
 ENV DEBIAN_FRONTEND noninteractive

Dockerfile.cn

@@ -19,7 +19,7 @@ WORKDIR /app
 RUN yarn install && yarn run build:docker
 
 # images
-FROM ubuntu:latest
+FROM ubuntu:20.04
 
 # set as non-interactive
 ENV DEBIAN_FRONTEND noninteractive

Dockerfile.local

@@ -19,7 +19,7 @@ WORKDIR /app
 RUN yarn install && yarn run build:docker
 
 # images
-FROM ubuntu:latest
+FROM ubuntu:20.04
 
 # set as non-interactive
 ENV DEBIAN_FRONTEND noninteractive

backend/go.mod

@@ -2,4 +2,4 @@ module crawlab
 
 go 1.16
 
-require github.com/crawlab-team/crawlab-core v0.6.0-beta.20220420.1200
+require github.com/crawlab-team/crawlab-core v0.6.0

backend/go.sum

@@ -122,8 +122,8 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/crawlab-team/crawlab-core v0.0.1/go.mod h1:6dJHMvrmIJbfYHhYNeGZkGOLEBvur+yGiFzLCRXx92k=
-github.com/crawlab-team/crawlab-core v0.6.0-beta.20220420.1200 h1:ngwvPofCVO7dhvpnAInjdJnwPX0iOTc7GmGJnqXD2Wc=
-github.com/crawlab-team/crawlab-core v0.6.0-beta.20220420.1200/go.mod h1:KqfjSkEclVY39nC58bsq3MLcuXbDnsPp/ClcBDkqOF0=
+github.com/crawlab-team/crawlab-core v0.6.0 h1:CGxdztjcIkozZp2EHXFN1brvKxIAdD0Xe1l4c+SFNE8=
+github.com/crawlab-team/crawlab-core v0.6.0/go.mod h1:KqfjSkEclVY39nC58bsq3MLcuXbDnsPp/ClcBDkqOF0=
 github.com/crawlab-team/crawlab-db v0.0.2/go.mod h1:o7o4rbcyAWlFGHg9VS7V7tM/GqRq+N2mnAXO71cZA78=
 github.com/crawlab-team/crawlab-db v0.6.0-beta.20220417.1300 h1:2EymVIiOspX28qNC1Qon3W1fzXKQ8hi6ho3QtXB4w6k=
 github.com/crawlab-team/crawlab-db v0.6.0-beta.20220417.1300/go.mod h1:gfeF0nAnFuup6iYvgHkY0in/HpO/+JktXqVNMdhoxhU=

bin/docker-start-master.sh

@@ -1,16 +1,24 @@
-# replace base url
-if [ "${CRAWLAB_BASE_URL}" = "" ];
-then
+# replace env
+indexpath=/app/dist/index.html
+if test -z "$CRAWLAB_BASE_URL"; then
 	:
 else
-	indexpath=/app/dist/index.html
 	sed -i "s?/js/?${CRAWLAB_BASE_URL}/js/?g" ${indexpath}
 	sed -i "s?/css/?${CRAWLAB_BASE_URL}/css/?g" ${indexpath}
-
 	sed -i "s/  <link rel=\"icon\" type=\"image\/x-icon\" href=\"/  <link rel=\"icon\" type=\"image\/x-icon\" href=\"\/${CRAWLAB_BASE_URL}/g"  ${indexpath}
 	sed -i "s/  <link rel=\"stylesheet\" href=\"/  <link rel=\"stylesheet\" href=\"${CRAWLAB_BASE_URL}\//g"  ${indexpath}
 	sed -i "s/  window.VUE_APP_API_BASE_URL = '/  window.VUE_APP_API_BASE_URL = '\/${CRAWLAB_BASE_URL}/g" ${indexpath}
 fi
+if test -z "$CRAWLAB_INIT_BAIDU_TONGJI"; then
+	:
+else
+	sed -i "s/  window.VUE_APP_INIT_BAIDU_TONGJI = ''/  window.VUE_APP_INIT_BAIDU_TONGJI = '${CRAWLAB_INIT_BAIDU_TONGJI}'/g" ${indexpath}
+fi
+if test -z "$CRAWLAB_INIT_UMENG"; then
+	:
+else
+	sed -i "s/  window.VUE_APP_INIT_UMENG = ''/  window.VUE_APP_INIT_UMENG = '${CRAWLAB_INIT_UMENG}'/g" ${indexpath}
+fi
 
 # start nginx
 service nginx start