From bbf573c836448895fcf8b630c0a244f0081ebda6 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 16 Aug 2019 00:57:17 +0800 Subject: [PATCH 1/2] updated Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3eb0ab5b..05283d0c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ pipeline { steps { echo "Building..." sh """ - docker build -t tikazyq/crawlab:${ENV:TAG} -f ${ENV.DOCKERFILE} . + docker build -t tikazyq/crawlab:${ENV:TAG} -f ${ENV:DOCKERFILE} . """ } } From 04ae672fcb00d211590d74350c43a772d0bc72d0 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 16 Aug 2019 01:15:56 +0800 Subject: [PATCH 2/2] updated Jenkinsfile --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 05283d0c..a6f5f9ab 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,13 +18,13 @@ pipeline { env.DOCKERFILE = 'Dockerfile.local' } else if (env.GIT_BRANCH == 'frontend') { env.TAG = 'frontend-alpine' - env.DOCKERFILE = 'frontend/Dockerfile.frontend.alpine' + env.DOCKERFILE = 'docker/Dockerfile.frontend.alpine' } else if (env.GIT_BRANCH == 'backend-master') { env.TAG = 'master-alpine' - env.DOCKERFILE = 'frontend/Dockerfile.master.alpine' + env.DOCKERFILE = 'docker/Dockerfile.master.alpine' } else if (env.GIT_BRANCH == 'backend-worker') { env.TAG = 'worker-alpine' - env.DOCKERFILE = 'frontend/Dockerfile.worker.alpine' + env.DOCKERFILE = 'docker/Dockerfile.worker.alpine' } } }