diff --git a/docker-compose.yml b/docker-compose.yml index 23be9a7..aec9b55 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,11 +3,6 @@ services: env_file: "stack.env" image: mariadb:latest container_name: mariadb - environment: - MARIADB_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} - MARIADB_DATABASE: ${MYSQL_DATABASE} - MARIADB_USER: ${MYSQL_USER} - MARIADB_PASSWORD: ${MYSQL_USER_PASSWORD} volumes: - mariadb_data:/var/lib/mysql networks: @@ -17,10 +12,6 @@ services: env_file: "stack.env" image: phpmyadmin/phpmyadmin container_name: phpmyadmin - environment: - PMA_HOST: mariadb - PMA_USER: ${MYSQL_USER} - PMA_PASSWORD: ${MYSQL_PASSWORD} ports: - 8080:80 networks: @@ -35,16 +26,6 @@ services: - NODE_ENV=production context: ./ dockerfile: Dockerfile.server - environment: - - NODE_ENV=production - - MYSQL_HOST=${MYSQL_HOST} - - MYSQL_PORT=${MYSQL_PORT} - - MYSQL_DATABASE=${MYSQL_DATABASE} - - MYSQL_USER=${MYSQL_USER} - - MYSQL_USER_PASSWORD=${MYSQL_USER_PASSWORD} - - HOSTNAME=${HOSTNAME} - - PORT=${PORT} - - PUBLIC_URL=${PUBLIC_URL} ports: - 3001:3001 networks: diff --git a/stack.env b/stack.env index 53f4967..ddd245b 100644 --- a/stack.env +++ b/stack.env @@ -1,3 +1,12 @@ +MARIADB_ROOT_PASSWORD=uZm#bch6pPs8 +MARIADB_DATABASE=uecko +MARIADB_USER=uecko +MARIADB_PASSWORD=u8Ax5Nw3%sjd + +PMA_HOST=mariadb +PMA_USER=uecko +PMA_PASSWORD=u8Ax5Nw3%sjd + MYSQL_HOST=mariadb MYSQL_PORT=3306 MYSQL_ROOT_PASSWORD=uZm#bch6pPs8