Docker related changes: Mark cleandb executable. Clean settings_local and settings_local_sqlitetest of flakes and types issues.

- Legacy-Id: 19637

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/'

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/'

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 /