Skip to content

Commit 2d7525f

Browse files
committed
Use MySQL 5.7.25 Docker Official Image
1 parent c22996b commit 2d7525f

File tree

4 files changed

+4
-48
lines changed

4 files changed

+4
-48
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ rm:
6868
@echo "Removing $(CONTAINER) and $(CONTAINER)_db"
6969
docker rm -f $(CONTAINER)
7070
docker rm -f $(CONTAINER)_db
71+
docker rm -f $(CONTAINER)_phpmyadmin
7172

7273
state:
7374
docker ps -a | grep $(CONTAINER)

docker-cloud.yml

Lines changed: 0 additions & 45 deletions
This file was deleted.

docker-compose.local.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
env_file:
1717
- .env
1818
db:
19-
image: 'htmlgraphic/mysql:5.7.18'
19+
image: 'mysql:5.7.25'
2020
container_name: apache_db
2121
volumes:
2222
- 'db-data:/var/lib/mysql'
@@ -26,7 +26,7 @@ services:
2626
- .env
2727
phpmyadmin:
2828
image: 'marvambass/phpmyadmin:latest'
29-
restart: always
29+
container_name: apache_phpmyadmin
3030
ports:
3131
- '8080:443'
3232
volumes:

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ hg-web:
1010
links:
1111
- "hg-db:mysql"
1212
hg-db:
13-
image: 'htmlgraphic/mysql:5.7.18'
13+
image: 'mysql:5.7.25'
1414
environment:
1515
- MYSQL_DATABASE=htmlgraphic
1616
- MYSQL_PASSWORD=new_password

0 commit comments

Comments
 (0)