Skip to content

Commit 7a5cd67

Browse files
committed
update ubuntu & mysql base versions
1 parent 2cac14b commit 7a5cd67

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22
MAINTAINER Jason Gegere <jason@htmlgraphic.com>
33

44
ENV OS_LOCALE="en_US.UTF-8"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ run:
6868
@echo " THE PASSWORD FOR ${bold}$(MYSQL_USER)${normal} IS ${bold}$(MYSQL_PASSWORD)${normal};"
6969
@echo ''
7070
@echo " docker exec -it apache_db /bin/bash \n \
71-
mysql -p \n \
71+
mysql -p '$(MYSQL_ROOT_PASSWORD)' \n \
7272
GRANT ALL PRIVILEGES ON * . * TO '$(MYSQL_USER)'@'%' with grant option; \n"
7373

7474
docker-compose -f $(COMPOSE_FILE) up -d --remove-orphans

docker-compose.local.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222
max-size: "200k"
2323
max-file: "10"
2424
db:
25-
image: 'mysql:5.7.29'
25+
image: 'mysql:8.1'
2626
container_name: apache_db
2727
volumes:
2828
- 'db-data:/var/lib/mysql'

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
links:
1717
- "db:mysql"
1818
db:
19-
image: 'mysql:5.7.29'
19+
image: 'mysql:8.1'
2020
restart: unless-stopped
2121
volumes:
2222
- 'db-data:/var/lib/mysql'

0 commit comments

Comments
 (0)