From 13d4e636bc9f62862419cb1058b3a35af614dd19 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Thu, 11 Nov 2021 16:35:30 +0000
Subject: [PATCH] Docker related changes: Mark cleandb executable. Clean
 settings_local and settings_local_sqlitetest of flakes and types issues.  -
 Legacy-Id: 19637

---
 docker/cleandb                              | 0
 docker/configs/settings_local.py            | 2 --
 docker/configs/settings_local_sqlitetest.py | 4 +---
 docker/db.Dockerfile                        | 4 ++++
 4 files changed, 5 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 docker/cleandb

diff --git a/docker/cleandb b/docker/cleandb
old mode 100644
new mode 100755
diff --git a/docker/configs/settings_local.py b/docker/configs/settings_local.py
index bb9210090..1bb9b7d80 100644
--- a/docker/configs/settings_local.py
+++ b/docker/configs/settings_local.py
@@ -40,8 +40,6 @@ EMAIL_PORT=2025
 
 TRAC_WIKI_DIR_PATTERN = "test/wiki/%s"
 TRAC_SVN_DIR_PATTERN = "test/svn/%s"
-TRAC_CREATE_ADHOC_WIKIS = [
-]                                       # type: List[Tuple[str, str, str]]
 
 MEDIA_BASE_DIR = 'test'
 MEDIA_ROOT = MEDIA_BASE_DIR + '/media/'
diff --git a/docker/configs/settings_local_sqlitetest.py b/docker/configs/settings_local_sqlitetest.py
index a93f3f181..098a4a6fd 100644
--- a/docker/configs/settings_local_sqlitetest.py
+++ b/docker/configs/settings_local_sqlitetest.py
@@ -11,7 +11,7 @@
 
 import os 
 from ietf.settings import *                                          # pyflakes:ignore
-from ietf.settings import TEST_CODE_COVERAGE_CHECKER, BASE_DIR, PHOTOS_DIRNAME
+from ietf.settings import TEST_CODE_COVERAGE_CHECKER
 import debug                            # pyflakes:ignore
 debug.debug = True
 
@@ -65,8 +65,6 @@ EMAIL_PORT=2025
 
 TRAC_WIKI_DIR_PATTERN = "test/wiki/%s"
 TRAC_SVN_DIR_PATTERN = "test/svn/%s"
-TRAC_CREATE_ADHOC_WIKIS = [
-]                                       # type: List[Tuple[str, str, str]]
 
 MEDIA_BASE_DIR = 'test'
 MEDIA_ROOT = MEDIA_BASE_DIR + '/media/'
diff --git a/docker/db.Dockerfile b/docker/db.Dockerfile
index 00a08c8d0..b9cc773ec 100644
--- a/docker/db.Dockerfile
+++ b/docker/db.Dockerfile
@@ -24,6 +24,10 @@ ENV LC_ALL en_US.UTF-8
 # Turn on mariadb performance_schema
 RUN sed -i 's/\[mysqld\]/\[mysqld\]\nperformance_schema=ON/' /etc/mysql/mariadb.conf.d/50-server.cnf
 
+# Set mariadb default charset to utf8 instead of utf8mb4 to match production
+RUN sed -i 's/utf8mb4/utf8/' /etc/mysql/mariadb.conf.d/50-server.cnf 
+RUN sed -i 's/unicode_ci/general_ci/' /etc/mysql/mariadb.conf.d/50-server.cnf 
+
 # Make the mariadb sys schema available for possible installation
 # We would normally use the next line, but that has a bug:
 # ADD https://github.com/FromDual/mariadb-sys/archive/master.zip /