Skip to content

Commit

Permalink
add Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
starsliao committed Feb 22, 2022
1 parent 87f4578 commit 1565afa
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 2 deletions.
22 changes: 22 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
help:
echo "Read Makefile"

build:
cd flask-consul && docker build -t flask-consul:latest .
cd vue-consul && docker build -t nginx-consul:latest .
echo -e "\n\n自行编译的版本,注意修改docker-compose.yml中的镜像地址为本地仓库后再启动。"
echo -e "\n\nBlackbox-Manager:\nhttp://{ip}:1026"

push:
docker login [email protected] registry.cn-shenzhen.aliyuncs.com
docker tag nginx-consul:latest registry.cn-shenzhen.aliyuncs.com/starsl/nginx-consul:latest
docker tag nginx-consul:latest registry.cn-shenzhen.aliyuncs.com/starsl/nginx-consul:${vf}
docker tag flask-consul:latest registry.cn-shenzhen.aliyuncs.com/starsl/flask-consul:latest
docker tag flask-consul:latest registry.cn-shenzhen.aliyuncs.com/starsl/flask-consul:${vb}
docker push registry.cn-shenzhen.aliyuncs.com/starsl/nginx-consul:latest
docker push registry.cn-shenzhen.aliyuncs.com/starsl/nginx-consul:${vf}
docker push registry.cn-shenzhen.aliyuncs.com/starsl/flask-consul:latest
docker push registry.cn-shenzhen.aliyuncs.com/starsl/flask-consul:${vb}

update:
docker-compose pull && docker-compose up -d
1 change: 1 addition & 0 deletions flask-consul/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
flask==2.0.2
flask-restful==0.3.9
flask-cors==3.0.10
itsdangerous==2.0.1
Flask-HTTPAuth==4.5.0
requests==2.27.1
File renamed without changes.
4 changes: 2 additions & 2 deletions docker-push.sh → units/docker-push.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
vf=0.3.0
vb=0.3.0
vf=0.3.1
vb=0.3.1
docker login [email protected] registry.cn-shenzhen.aliyuncs.com

docker tag nginx-consul:latest registry.cn-shenzhen.aliyuncs.com/starsl/nginx-consul:latest
Expand Down

0 comments on commit 1565afa

Please sign in to comment.