Commit c9727667 authored by zkuang's avatar zkuang

[BUG FIXING] build images with master branches and fix database migration

parent 6e7d1fdb
...@@ -46,7 +46,7 @@ services: ...@@ -46,7 +46,7 @@ services:
- ALI_IOT_AMQP_CLIENT_ID=carbinet - ALI_IOT_AMQP_CLIENT_ID=carbinet
networks: networks:
- ego - ego
command: ["./wait-for-it.sh", "mysql:3306", "--", "sh", "-c", "flask db migrate && flask db upgrade"] command: ["./wait-for-it.sh", "mysql:3306", "--", "sh", "-c", "mkdir migrations/versions && flask db migrate && flask db upgrade"]
carbinet_seed: carbinet_seed:
build: . build: .
......
...@@ -15,10 +15,10 @@ build() { ...@@ -15,10 +15,10 @@ build() {
if [ -d "./ziti/.git" ]; then if [ -d "./ziti/.git" ]; then
pushd ./ziti pushd ./ziti
git pull origin cas git pull origin master
popd popd
else else
git clone -b cas --single-branch --depth=1 http://git.gz-ego.com/iot/ziti.git git clone -b master --single-branch --depth=1 http://git.gz-ego.com/iot/ziti.git
fi fi
rm -rf ziti/carbinet_service/migrations/versions/* rm -rf ziti/carbinet_service/migrations/versions/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment