diff --git a/docs/Dockerfile/Dockerfile b/docs/Dockerfile/Dockerfile index c46cefc..90c0e0c 100644 --- a/docs/Dockerfile/Dockerfile +++ b/docs/Dockerfile/Dockerfile @@ -1,5 +1,5 @@ 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 apk update && apk add --no-cache nginx mariadb nodejs-npm git diff --git a/docs/Dockerfile/scripts/init_config.sh b/docs/Dockerfile/scripts/init_config.sh index f2d87fb..134f1fa 100644 --- a/docs/Dockerfile/scripts/init_config.sh +++ b/docs/Dockerfile/scripts/init_config.sh @@ -10,6 +10,16 @@ BASE_DIR = os.path.dirname(os.path.abspath(__file__)) DOCKER_URL = 'unix:///var/run/docker.sock' 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 # 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