diff --git a/Jenkinsfile b/Jenkinsfile index c757366e..7a46844b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,11 +12,13 @@ pipeline { script { if (env.GIT_BRANCH == 'develop') { env.MODE = 'develop' + env.TAG = 'develop' + env.BASE_URL = '/dev' } else if (env.GIT_BRANCH == 'master') { env.MODE = 'production' - } else { - env.MODE = 'test' - } + env.TAG = 'master' + env.BASE_URL = '/demo' + } } } } @@ -24,7 +26,7 @@ pipeline { steps { echo "Building..." sh """ - docker build -t tikazyq/crawlab:latest -f Dockerfile.local . + docker build -t tikazyq/crawlab:${ENV:TAG} -f Dockerfile.local . """ } } @@ -37,9 +39,12 @@ pipeline { steps { echo 'Deploying....' sh """ - cd ./jenkins + echo ${ENV:GIT_BRANCH} + """ + sh """ + cd ./jenkins/${ENV:GIT_BRANCH} docker-compose stop | true - docker-compose up -d + docker-compose up -d --scale worker=3 """ } } diff --git a/frontend/src/components/InfoView/SpiderInfoView.vue b/frontend/src/components/InfoView/SpiderInfoView.vue index 7bd6b99f..45560c60 100644 --- a/frontend/src/components/InfoView/SpiderInfoView.vue +++ b/frontend/src/components/InfoView/SpiderInfoView.vue @@ -29,7 +29,7 @@ - + + border + @row-click="onRowClick" + >