U - update dockerfile

1.x
张玉坡 2019-10-28 07:41:57 +08:00
parent 48760f9fea
commit 9039f1dabe
2 changed files with 11 additions and 1 deletions

View File

@ -1,5 +1,5 @@
FROM python:3.6-alpine FROM python:3.6-alpine
ENV VERSION=1.0.5 ENV VERSION=1.1.0
RUN echo -e "http://mirrors.aliyun.com/alpine/v3.10/main\nhttp://mirrors.aliyun.com/alpine/v3.10/community" > /etc/apk/repositories RUN echo -e "http://mirrors.aliyun.com/alpine/v3.10/main\nhttp://mirrors.aliyun.com/alpine/v3.10/community" > /etc/apk/repositories
RUN apk update && apk add --no-cache nginx mariadb nodejs-npm git RUN apk update && apk add --no-cache nginx mariadb nodejs-npm git

View File

@ -10,6 +10,16 @@ BASE_DIR = os.path.dirname(os.path.abspath(__file__))
DOCKER_URL = 'unix:///var/run/docker.sock' DOCKER_URL = 'unix:///var/run/docker.sock'
SQLALCHEMY_ECHO = False SQLALCHEMY_ECHO = False
LDAP_CONFIG = {
'host': '172.24.64.55',
'port': 389,
'is_openldap': True,
'base_dn': 'dc=spug,dc=com',
'admin_dn': 'cn=admin,dc=spug,dc=com',
'admin_password': 'spugpwd',
'user_filter': 'cn',
}
EOF EOF
# echo "SQLALCHEMY_DATABASE_URI = 'mysql+pymysql://${MYSQL_USER:-spuguser}:${MYSQL_PASSWORD:-spugpwd}@${MYSQL_HOST:-localhost}:${MYSQL_PORT:-3306}/${MYSQL_DATABASE:-spug}?unix_socket=/run/mysqld/mysqld.sock'" >> /spug/spug_api/config.py # echo "SQLALCHEMY_DATABASE_URI = 'mysql+pymysql://${MYSQL_USER:-spuguser}:${MYSQL_PASSWORD:-spugpwd}@${MYSQL_HOST:-localhost}:${MYSQL_PORT:-3306}/${MYSQL_DATABASE:-spug}?unix_socket=/run/mysqld/mysqld.sock'" >> /spug/spug_api/config.py