Merge branch 'dev'

MI-DPLA · May 4, 2020 · 12c22d3 · 12c22d3
2 parents 894d9cd + a59ffe8
commit 12c22d3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/combine/localsettings.py.docker b/combine/localsettings.py.docker
@@ -112,7 +112,7 @@ METADATA_PREFIXES = {
 
 # Database configurations for use in Spark context
 COMBINE_DATABASE = {
-	'jdbc_url':'jdbc:mysql://mysql:3306/combine',
+	'jdbc_url':'jdbc:mysql://mysql:3307/combine',
 	'user':settings.DATABASES['default']['USER'],
 	'password':settings.DATABASES['default']['PASSWORD']
 }
@@ -172,6 +172,6 @@ DATABASES = {
         'USER': 'combine',
         'PASSWORD': 'combine',
         'HOST': 'mysql',
-        'PORT': '3306',
+        'PORT': '3307',
     }
 }