zhba/zhba_management_w_bf.git

智慧保安后台管理-外网项目备份

parent: 6b428b9b | patch | commit | ignore whitespace

Administrator

2022-04-12 273b4756c9ba681b7e2b9327b3e57050741f19e0

docker-compose.yml 修改

2 files modified

	Jenkinsfile-docker-compose	1 ●●●●● patch \| view \| raw \| blame \| history
	docker-compose.yml	3 ●●●●● patch \| view \| raw \| blame \| history

 Jenkinsfile-docker-compose

@@ -46,6 +46,7 @@
      steps {
          input '是否部署？'
          sh 'docker-compose up -d'
          sh 'docker rmi  $REGISTRY/$DOCKERHUB_NAMESPACE/zhbaw:SNAPSHOT-$(BUILD_NUMBER-1)'
        }
    }
  }

 docker-compose.yml

@@ -2,7 +2,8 @@
services:
  zhbaw:
    # 从 Harbor 私有仓库拉取镜像
    image: 192.168.0.191/zhbaw/zhbaw:SNAPSHOT-$BUILD_NUMBER
#    image: 192.168.0.191/zhbaw/zhbaw:SNAPSHOT-$BUILD_NUMBER
    image: zhbaw:SNAPSHOT-$BUILD_NUMBER
    container_name: zhbaw
#    deploy:
#      replicas: 1

			@@ -46,6 +46,7 @@
			steps {
			input '是否部署？'
			sh 'docker-compose up -d'
			sh 'docker rmi $REGISTRY/$DOCKERHUB_NAMESPACE/zhbaw:SNAPSHOT-$(BUILD_NUMBER-1)'
			}
			}
			}

			@@ -2,7 +2,8 @@
			services:
			zhbaw:
			# 从 Harbor 私有仓库拉取镜像
			image: 192.168.0.191/zhbaw/zhbaw:SNAPSHOT-$BUILD_NUMBER
			# image: 192.168.0.191/zhbaw/zhbaw:SNAPSHOT-$BUILD_NUMBER
			image: zhbaw:SNAPSHOT-$BUILD_NUMBER
			container_name: zhbaw
			# deploy:
			# replicas: 1