Use MySQL 5.7.25 Docker Official Image

Author: gegere

Makefile

@@ -68,6 +68,7 @@ rm:
 	@echo "Removing $(CONTAINER) and $(CONTAINER)_db"
 	docker rm -f $(CONTAINER)
 	docker rm -f $(CONTAINER)_db
+	docker rm -f $(CONTAINER)_phpmyadmin
 
 state:
 	docker ps -a | grep $(CONTAINER)

docker-cloud.yml

@@ -16,7 +16,7 @@ services:
     env_file:
       - .env
   db:
-    image: 'htmlgraphic/mysql:5.7.18'
+    image: 'mysql:5.7.25'
     container_name: apache_db
     volumes:
       - 'db-data:/var/lib/mysql'
@@ -26,7 +26,7 @@ services:
       - .env
   phpmyadmin:
     image: 'marvambass/phpmyadmin:latest'
-    restart: always
+    container_name: apache_phpmyadmin
     ports:
       - '8080:443'
     volumes:

docker-compose.local.yml

@@ -10,7 +10,7 @@ hg-web:
   links:
     - "hg-db:mysql"
 hg-db:
-  image: 'htmlgraphic/mysql:5.7.18'
+  image: 'mysql:5.7.25'
   environment:
     - MYSQL_DATABASE=htmlgraphic
     - MYSQL_PASSWORD=new_password