Merge pull request #1 from sjohn2/dev

Fixed mysql connectivity issue and cleaned up .env file

Author: sjohn2

.env

@@ -1,16 +1,7 @@
-WORDPRESS_IMAGE=wordpress
-
 MYSQL_DATABASE_NAME=wordpress
 MYSQL_USER=wordpress
-MYSQL_PASSWORD=Password1@34
-MYSQL_ROOT_PASSWORD=Password1@34
-
-SITE_PORT=80
+MYSQL_PASSWORD=wordpress
+MYSQL_ROOT_PASSWORD=password
+SITE_PORT=8000:80
 MYSQL_PORT=3306
-PHP_MY_ADMIN_PORT=8088
-
-HOSTNAME=localhost
-SITE_URL=http://localhost
-
-DOCKER_VOLUME_APP=wp-app
-DOCKER_VOLUME_DB=wp-db
+PHP_MY_ADMIN_PORT=8080:80

docker-compose.yml

@@ -1,62 +1,52 @@
 version: '3.4'
 
 services:
-  site:
-    image: ${WORDPRESS_IMAGE}
-    depends_on:
-      - database
-    restart: always
-    ports:
-      - "80:80"
-    volumes:
-      - ./${DOCKER_VOLUME_APP}:/var/www/html
-    environment:
-      WORDPRESS_DB_HOST: "database"
-      WORDPRESS_DB_NAME: ${MYSQL_DATABASE_NAME}
-      WORDPRESS_DB_USER: ${MYSQL_USER}
-      WORDPRESS_DB_PASSWORD: ${MYSQL_PASSWORD}
-    healthcheck:
-      test: ["CMD", "curl", "-f", "${SITE_URL}"]
-      interval: 1m
-      timeout: 30s
-      retries: 3
-      start_period: 0s
-
-  database:
+  # Database
+  db:
     image: mysql:5.7
     command: mysqld --sql_mode=""
     volumes:
-      - ./.${DOCKER_VOLUME_DB}:/var/lib/mysql
+      - ./db-data:/var/lib/mysql
     restart: always
-    ports:
-      - "${MYSQL_PORT}:3306"
     environment:
       MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
       MYSQL_DATABASE: ${MYSQL_DATABASE_NAME}
       MYSQL_USER: ${MYSQL_USER}
-      MYSQL_PASSWORD: ${MYSQL_USER}
-    healthcheck:
-      test: ["CMD", "mysqladmin" ,"ping", "-h", "${SITE_URL}"]
-      interval: 1m
-      timeout: 30s
-      retries: 3
-      start_period: 0s
-
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+    networks:
+      - wpsite
+  # phpmyadmin
   phpmyadmin:
+    depends_on:
+      - db
     image: phpmyadmin/phpmyadmin
     restart: always
+    ports:
+      - '${PHP_MY_ADMIN_PORT}'
+    environment:
+      PMA_HOST: db
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} 
+    networks:
+      - wpsite
+  # Wordpress
+  wordpress:
     depends_on:
-      - database
+      - db
+    image: wordpress:latest
     ports:
-      - "${PHP_MY_ADMIN_PORT}:80"
+      - '${SITE_PORT}'
+    restart: always
+    volumes: ['./wp-app/:/var/www/html']
     environment:
-      MYSQL_USER: ${MYSQL_USER}
-      MYSQL_PASSWORD: ${MYSQL_USER}
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-      PMA_HOST: database
-    healthcheck:
-      test: ["CMD", "curl", "-f", "${SITE_URL}"]
-      interval: 1m
-      timeout: 30s
-      retries: 3
-      start_period: 0s
+      WORDPRESS_DB_HOST: db:3306
+      WORDPRESS_DB_USER: ${MYSQL_USER}
+      WORDPRESS_DB_PASSWORD: ${MYSQL_PASSWORD}
+    networks:
+      - wpsite
+networks:
+  wpsite:
+volumes:
+  db-data:
+    driver: local
+  wp-app:
+    driver: local