diff --git a/Dockerfile b/Dockerfile index 2723f848..7ede9752 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,15 +13,15 @@ ARG BLUECHERRY_GROUP_ID ARG BLUECHERRY_USER_ID ENV DEBIAN_FRONTEND=noninteractive -ENV MYSQL_ADMIN_LOGIN=root -ENV MYSQL_ADMIN_PASSWORD=oom1ieth2aeK -ENV dbname=bluecherry -ENV host=mysql -ENV userhost=% -ENV user=bluecherry -ENV password=rohche6PieWi -ENV BLUECHERRY_GROUP_ID=1000 -ENV BLUECHERRY_USER_ID=1000 +ENV MYSQL_ADMIN_LOGIN=$MYSQL_ADMIN_LOGIN +ENV MYSQL_ADMIN_PASSWORD=$MYSQL_ADMIN_PASSWORD +ENV dbname=$BLUECHERRY_DB_NAME +ENV host=$MYSQL_HOST +ENV userhost=$BLUECHERRY_USERHOST +ENV user=$BLUECHERRY_DB_USER +ENV password=$BLUECHERRY_DB_PASSWORD +ENV BLUECHERRY_GROUP_ID=${BLUECHERRY_GROUP_ID:-1001} +ENV BLUECHERRY_USER_ID=${BLUECHERRY_USER_ID:-1001} ####################################################### # build the application from github diff --git a/docker-compose.yml b/docker-compose.yml index 5b25d7f9..f8b21704 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: volumes: - ./db:/var/lib/mysql environment: - MYSQL_ROOT_PASSWORD: oom1ieth2aeK + MYSQL_ROOT_PASSWORD: $MYSQL_ADMIN_PASSWORD TZ: $TZ bluecherry: