Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

重新打包镜像,将环境的配置全部转为容器内来操作完成 #6

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
重新打包镜像,将环境的配置全部转为容器内来操作完成
  • Loading branch information
pingod committed Jun 9, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 6d9f6ec1fb6518dcc67ffa17b6fc2b0e3187efc9
2 changes: 2 additions & 0 deletions codo_admin_beta0.3.sql
Original file line number Diff line number Diff line change
@@ -18,6 +18,8 @@
-- Dumping data for table `mg_app_settings`
--

use codo_admin;

LOCK TABLES `mg_app_settings` WRITE;
/*!40000 ALTER TABLE `mg_app_settings` DISABLE KEYS */;
/*!40000 ALTER TABLE `mg_app_settings` ENABLE KEYS */;
3 changes: 2 additions & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ services:
hostname: codo-mysql
image: mysql:5.7
volumes:
- ../data.sql:/docker-entrypoint-initdb.d/create_database.sql
- ../create_database.sql:/docker-entrypoint-initdb.d/create_database.sql
- ../codo_admin_beta0.3.sql:/docker-entrypoint-initdb.d/codo_admin_beta0.3.sql
- /data/mysql:/var/lib/mysql
- /data/mysql_conf:/etc/mysql/conf.d
@@ -46,6 +46,7 @@ services:
env_file:
- ./env.sh
restart: unless-stopped
hostname: codo-admin
image: registry.cn-hangzhou.aliyuncs.com/sourcegarden/opendevops-admin:alpine-0.3.0
volumes:
- /var/log/supervisor/:/var/log/supervisor/
15 changes: 14 additions & 1 deletion docker/prestart.sh
Original file line number Diff line number Diff line change
@@ -14,4 +14,17 @@ sed -i "s#cookie_secret = .*#cookie_secret = '${cookie_secret}'#g" settings.py &
sed -i "s#READONLY_DB_DBPWD = .*#READONLY_DB_DBPWD = os.getenv('READONLY_DB_DBPWD', '${READONLY_DB_DBPWD}')#g" settings.py && \
sed -i "s#READONLY_DB_DBNAME = .*#READONLY_DB_DBNAME = os.getenv('READONLY_DB_DBNAME', '${DEFAULT_DB_DBNAME}')#g" settings.py

#python3 /var/www/kerrigan/db_sync.py

try_num=0

while [[ $try_num -le 100 ]];
do
if $(curl -s ${DEFAULT_DB_DBHOST}:${DEFAULT_DB_DBPORT} > /dev/null);then
python3 db_sync.py
exit 0
else
echo 'wait mysql start to do db_sync.db'
fi
let try_num+=1
sleep 6
done