fix jenkinsfile

deploy/Jenkinsfile

@@ -16,12 +16,7 @@ pipeline {
         container('docker') {
           echo "构建 Docker 镜像阶段"
           sh 'echo "nameserver 114.114.114.114" >> /etc/resolv.conf'
-<<<<<<< HEAD
-          sh 'docker build --target image-idctest  -t ${IMAGE_REPO}/aihub-backend:${ENV_APP} --output type=docker .'
-          sh 'docker build --target image-idcprod -t ${IMAGE_REPO}/datax-admin:${ENV_APP} --output type=docker .'
-=======
-          sh 'docker build --target ${ENV_TARGET} -t ${IMAGE_REPO}/datax-admin:${ENV_APP} --output type=docker .'
->>>>>>> 7e2e28dcc8f1b954ceeee54803092bdca84eb2a6
+          sh 'docker build --target ${ENV_TARGET} -t ${IMAGE_REPO}/aihub-backend:${ENV_APP} --output type=docker .'
           echo "build success"
         }
         script {
@@ -34,11 +29,7 @@ pipeline {
         container('docker') {
           echo "Push Docker 镜像阶段"
           sh'docker images'
-<<<<<<< HEAD
           sh 'docker push ${IMAGE_REPO}/aihub-backend:${ENV_APP} '
-=======
->>>>>>> 7e2e28dcc8f1b954ceeee54803092bdca84eb2a6
-          sh 'docker push ${IMAGE_REPO}/datax-admin:${ENV_APP} '
           echo "Push image success"
         }
         script {