From af376427624190c625cc32152cc98abae6f1aae2 Mon Sep 17 00:00:00 2001 From: Matt Griswold Date: Fri, 4 Nov 2022 01:04:47 -0500 Subject: [PATCH] update tests to mysql8 (#1262) --- .gitignore | 1 + Ctl/dev/docker-compose.yml | 15 +-------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index f0b25f6f..7e6f9210 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ *.env *.log *.py[cod] +*.sql *.sqlite *.sw* *.tar diff --git a/Ctl/dev/docker-compose.yml b/Ctl/dev/docker-compose.yml index 7f29f56f..55abd990 100644 --- a/Ctl/dev/docker-compose.yml +++ b/Ctl/dev/docker-compose.yml @@ -1,20 +1,13 @@ version: "3.4" services: database: - image: "mysql:5.7" + image: "mysql:8" command: mysqld --character-set-server=utf8 --collation-server=utf8_unicode_ci environment: MYSQL_DATABASE: peeringdb MYSQL_USER: peeringdb MYSQL_PASSWORD: devPASSWORD MYSQL_ALLOW_EMPTY_PASSWORD: 1 - #MYSQL_ROOT_PASSWORD: devPASSWORD -# # set logging options to output in json -# logging: -# driver: json-file -# options: -# max-size: 100m -# max-file: "3" restart: always ports: - "13306:3306" @@ -33,12 +26,6 @@ services: DATABASE_USER: peeringdb DATABASE_PASSWORD: devPASSWORD DATABASE_HOST: database -# # set logging options to output in json -# logging: -# driver: json-file -# options: -# max-size: 100m -# max-file: "3" ports: # this needs to be set in the shell, compose env vars aren't read yet - "${DJANGO_PORT:-8000}:8000"