diff --git a/.env b/.env deleted file mode 100644 index 7c720ab..0000000 --- a/.env +++ /dev/null @@ -1,2 +0,0 @@ -MYSQL_PASSWORD:yourpassword -MYSQL_ROOT_PASSWORD:rootpassword \ No newline at end of file diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..16d0c76 --- /dev/null +++ b/.env.example @@ -0,0 +1,4 @@ +MYSQL_DATABASE=wordpress +MYSQL_USER=wp_user +MYSQL_PASSWORD=wp_pass_123 +MYSQL_ROOT_PASSWORD=root_pass_123 \ No newline at end of file diff --git a/.gitignore b/.gitignore index e69de29..2eea525 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +.env \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index fe94e18..cfaee0d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,31 +1,37 @@ services: db: image: mysql:8.0 - container_name: mysql_db - restart: always + container_name: wp_mysql + restart: unless-stopped environment: - MYSQL_DATABASE: wordpress - MYSQL_USER: wp_user + MYSQL_DATABASE: ${MYSQL_DATABASE} + MYSQL_USER: ${MYSQL_USER} MYSQL_PASSWORD: ${MYSQL_PASSWORD} MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} volumes: - db_data:/var/lib/mysql networks: - wp_network + healthcheck: + test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] + interval: 10s + timeout: 5s + retries: 5 wordpress: image: wordpress:latest - container_name: wordpress_app - restart: always + container_name: wp_app depends_on: - - db + db: + condition: service_healthy + restart: unless-stopped ports: - "8080:80" environment: WORDPRESS_DB_HOST: db:3306 - WORDPRESS_DB_USER: wp_user + WORDPRESS_DB_USER: ${MYSQL_USER} WORDPRESS_DB_PASSWORD: ${MYSQL_PASSWORD} - WORDPRESS_DB_NAME: wordpress + WORDPRESS_DB_NAME: ${MYSQL_DATABASE} volumes: - wp_data:/var/www/html networks: @@ -37,4 +43,5 @@ volumes: wp_data: networks: - wp_network: \ No newline at end of file + wp_network: + driver: bridge \ No newline at end of file