fix: change IP docker and jenkins
This commit is contained in:
parent
8ef008f06f
commit
8884333e4c
|
|
@ -7,15 +7,19 @@ build-dev:
|
||||||
when: on_success
|
when: on_success
|
||||||
only:
|
only:
|
||||||
- main
|
- main
|
||||||
image: docker:stable
|
image: docker:24.0.5
|
||||||
services:
|
services:
|
||||||
- name: docker:dind
|
- name: docker:24.0.5-dind
|
||||||
command: ["--insecure-registry=103.82.242.92:8900"]
|
command: ["--tls=false", "--insecure-registry=103.31.38.120:8900"]
|
||||||
|
variables:
|
||||||
|
DOCKER_HOST: "tcp://docker:2375"
|
||||||
|
DOCKER_TLS_CERTDIR: ""
|
||||||
script:
|
script:
|
||||||
- docker logout
|
- docker logout
|
||||||
- docker login -u $DEPLOY_USERNAME -p $DEPLOY_TOKEN 103.82.242.92:8900
|
- echo "$DEPLOY_TOKEN" | docker login -u "$DEPLOY_USERNAME" --password-stdin http://103.31.38.120:8900
|
||||||
- docker build -t 103.82.242.92:8900/medols/new-netidhub:dev .
|
- docker build -t new-netidhub-dev .
|
||||||
- docker push 103.82.242.92:8900/medols/new-netidhub:dev
|
- docker tag new-netidhub-dev 103.31.38.120:8900/medols/new-netidhub:dev
|
||||||
|
- docker push 103.31.38.120:8900/medols/new-netidhub:dev
|
||||||
|
|
||||||
auto-deploy:
|
auto-deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
|
|
@ -23,7 +27,5 @@ auto-deploy:
|
||||||
only:
|
only:
|
||||||
- main
|
- main
|
||||||
image: curlimages/curl:latest
|
image: curlimages/curl:latest
|
||||||
services:
|
|
||||||
- docker:dind
|
|
||||||
script:
|
script:
|
||||||
- curl --user admin:$JENKINS_PWD http://103.31.38.120:8080/job/auto-deploy-new-netidhub-public/build?token=autodeploynetidhub
|
- curl --user admin:$JENKINS_PWD http://38.47.185.86:8080/job/auto-deploy-new-netidhub-public/build?token=autodeploynetidhub
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue