From 12fc5cf74c297746b01b020ec32178cd9793cb63 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Wed, 7 Aug 2019 12:53:08 +0800 Subject: [PATCH 1/6] updated Jenkinsfile --- docker_init.sh | 11 ++++++++++- jenkins/develop/docker-compose.yaml | 1 + jenkins/master/docker-compose.yaml | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docker_init.sh b/docker_init.sh index d4f2ee9a..a8cbfeb9 100755 --- a/docker_init.sh +++ b/docker_init.sh @@ -6,10 +6,19 @@ then : else jspath=`ls /app/dist/js/app.*.js` - cp ${jspath} ${jspath}.bak sed -i "s?localhost:8000?${CRAWLAB_API_ADDRESS}?g" ${jspath} fi +# replace base url +if [ "${CRAWLAB_BASE_URL}" = "" ]; +then + : +else + indexpath=/app/dist/index.html + sed -i "s?/js/?${CRAWLAB_BASE_URL}/css/?g" ${indexpath} + sed -i "s?/css/?${CRAWLAB_BASE_URL}/css/?g" ${indexpath} +fi + # start nginx service nginx start diff --git a/jenkins/develop/docker-compose.yaml b/jenkins/develop/docker-compose.yaml index cf466671..ec95ae9f 100644 --- a/jenkins/develop/docker-compose.yaml +++ b/jenkins/develop/docker-compose.yaml @@ -4,6 +4,7 @@ services: image: "tikazyq/crawlab:develop" environment: CRAWLAB_API_ADDRESS: "crawlab.cn/dev/api" + CRAWLAB_BASE_URL: "/dev" CRAWLAB_SERVER_MASTER: "Y" CRAWLAB_MONGO_HOST: "mongo" CRAWLAB_REDIS_ADDRESS: "redis" diff --git a/jenkins/master/docker-compose.yaml b/jenkins/master/docker-compose.yaml index 0bcaee3a..7309829d 100644 --- a/jenkins/master/docker-compose.yaml +++ b/jenkins/master/docker-compose.yaml @@ -4,6 +4,7 @@ services: image: "tikazyq/crawlab:master" environment: CRAWLAB_API_ADDRESS: "crawlab.cn/api" + CRAWLAB_BASE_URL: "/demo" CRAWLAB_SERVER_MASTER: "Y" CRAWLAB_MONGO_HOST: "mongo" CRAWLAB_REDIS_ADDRESS: "redis" From 54a29965f60eaf5f7e74dfe0be61eb90753e1ed8 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Wed, 7 Aug 2019 13:05:26 +0800 Subject: [PATCH 2/6] updated Jenkinsfile --- docker_init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_init.sh b/docker_init.sh index a8cbfeb9..4d571769 100755 --- a/docker_init.sh +++ b/docker_init.sh @@ -15,7 +15,7 @@ then : else indexpath=/app/dist/index.html - sed -i "s?/js/?${CRAWLAB_BASE_URL}/css/?g" ${indexpath} + sed -i "s?/js/?${CRAWLAB_BASE_URL}/js/?g" ${indexpath} sed -i "s?/css/?${CRAWLAB_BASE_URL}/css/?g" ${indexpath} fi From 108b414cd60b36bc00864a66f7b34976ea3d9940 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Thu, 8 Aug 2019 12:40:58 +0800 Subject: [PATCH 3/6] updated Jenkinsfile --- Jenkinsfile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7a46844b..1252f6d5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,8 +52,23 @@ pipeline { steps { echo 'Cleanup...' sh """ - docker rmi `docker images | grep '' | grep -v IMAGE | awk '{ print \$3 }' | xargs` | true - docker rm `docker ps -a | grep Exited | awk '{ print \$1 }' | xargs` | true + # remove unused containers + container_ids=`docker ps -a | grep Exited | awk '{ print \$1 }' | xargs` + if [ \$container_ids -eq "" ]; + then + : + else + docker rm \$container_ids + fi + + # remove unused images + image_ids=`docker images | grep '' | grep -v IMAGE | awk '{ print \$3 }' | xargs` + if [ \$image_ids -eq "" ]; + then + : + else + docker rmi \$image_ids + fi """ } } From ae81b5adf361dfee2837385815aba404e5498ab3 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 10 Aug 2019 12:52:17 +0800 Subject: [PATCH 4/6] updated Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1252f6d5..b8721223 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,7 +44,7 @@ pipeline { sh """ cd ./jenkins/${ENV:GIT_BRANCH} docker-compose stop | true - docker-compose up -d --scale worker=3 + docker-compose up -d """ } } From b63b28e24cb27f4b9d541459e3f3d0617ccccdf0 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 10 Aug 2019 12:53:46 +0800 Subject: [PATCH 5/6] updated Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b8721223..1af2aa80 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -54,7 +54,7 @@ pipeline { sh """ # remove unused containers container_ids=`docker ps -a | grep Exited | awk '{ print \$1 }' | xargs` - if [ \$container_ids -eq "" ]; + if [ \\$container_ids -eq "" ]; then : else @@ -63,7 +63,7 @@ pipeline { # remove unused images image_ids=`docker images | grep '' | grep -v IMAGE | awk '{ print \$3 }' | xargs` - if [ \$image_ids -eq "" ]; + if [ \\$image_ids -eq "" ]; then : else From 42ca1ed653d68ef81c36e0e3fd8fdb4001c54cc1 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 10 Aug 2019 12:54:27 +0800 Subject: [PATCH 6/6] updated Jenkinsfile --- Jenkinsfile | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1af2aa80..0f2b89d7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,22 +53,9 @@ pipeline { echo 'Cleanup...' sh """ # remove unused containers - container_ids=`docker ps -a | grep Exited | awk '{ print \$1 }' | xargs` - if [ \\$container_ids -eq "" ]; - then - : - else - docker rm \$container_ids - fi # remove unused images - image_ids=`docker images | grep '' | grep -v IMAGE | awk '{ print \$3 }' | xargs` - if [ \\$image_ids -eq "" ]; - then - : - else - docker rmi \$image_ids - fi + """ } }