diff --git a/homelab/server/config/megan-portfolio/.env b/homelab/server/config/megan-portfolio/.env deleted file mode 100644 index e29cd316..00000000 --- a/homelab/server/config/megan-portfolio/.env +++ /dev/null @@ -1,2 +0,0 @@ -DOCKER_DATA=/home/joey/data/megan-portfolio - diff --git a/homelab/server/config/megan-portfolio/docker-compose.yml b/homelab/server/config/megan-portfolio/docker-compose.yml index 5682335a..f5733cc0 100644 --- a/homelab/server/config/megan-portfolio/docker-compose.yml +++ b/homelab/server/config/megan-portfolio/docker-compose.yml @@ -5,11 +5,9 @@ services: image: wordpress container_name: wordpress_megan-portfolio restart: "no" - environment: - WORDPRESS_DB_HOST: megan-portfolio_db - WORDPRESS_DB_USER: wordpress - WORDPRESS_DB_PASSWORD: wordpress - WORDPRESS_DB_NAME: wordpressdb + env_file: + - project.env + - megan-portfolio.env volumes: - ${DOCKER_DATA}/html:/var/www/html - ./upload.ini:/usr/local/etc/php/conf.d/uploads.ini @@ -28,11 +26,9 @@ services: restart: "no" networks: - portfolio - environment: - MYSQL_DATABASE: wordpressdb - MYSQL_USER: wordpress - MYSQL_PASSWORD: wordpress - MYSQL_RANDOM_ROOT_PASSWORD: '1' + env_file: + - project.env + - megan-portfolio-db.env volumes: - ${DOCKER_DATA}/db:/var/lib/mysql labels: diff --git a/homelab/server/config/megan-portfolio/megan-portfolio-db.env b/homelab/server/config/megan-portfolio/megan-portfolio-db.env new file mode 100644 index 00000000..825eb78d --- /dev/null +++ b/homelab/server/config/megan-portfolio/megan-portfolio-db.env @@ -0,0 +1,4 @@ +MYSQL_DATABASE=wordpressdb +MYSQL_USER=wordpress +MYSQL_PASSWORD=wordpress +MYSQL_RANDOM_ROOT_PASSWORD='1' \ No newline at end of file diff --git a/homelab/server/config/megan-portfolio/megan-portfolio.env b/homelab/server/config/megan-portfolio/megan-portfolio.env new file mode 100644 index 00000000..3f17922e --- /dev/null +++ b/homelab/server/config/megan-portfolio/megan-portfolio.env @@ -0,0 +1,4 @@ +WORDPRESS_DB_HOST=megan-portfolio_db +WORDPRESS_DB_USER=wordpress +WORDPRESS_DB_PASSWORD=wordpress +WORDPRESS_DB_NAME=wordpressdb \ No newline at end of file diff --git a/homelab/server/config/megan-portfolio/project.env b/homelab/server/config/megan-portfolio/project.env index e69de29b..aa48f19f 100644 --- a/homelab/server/config/megan-portfolio/project.env +++ b/homelab/server/config/megan-portfolio/project.env @@ -0,0 +1,2 @@ +# Volumes +DOCKER_DATA=/home/joey/data/megan-portfolio \ No newline at end of file