merge

.theia-workspace

@@ -0,0 +1,14 @@
+{
+   "folders": [
+
+      {
+         "path": "fet2020"
+      }
+   ],
+"settings": {
+    "launch": {},
+    "python.linting.flake8Enabled": true,
+    "python.linting.banditEnabled": true,
+    "python.testing.pytestEnabled": true
+}
+}

.workspace.theia-workspace

@@ -1,9 +0,0 @@
-{
-   "folders": [
-
-      {
-         "path": "fet2020"
-      }
-   ],
-   "settings": {}
-}

deployment/mysql.cnf

@@ -0,0 +1,11 @@
+[client]
+default-character-set=utf8mb4
+
+[mysql]
+default-character-set=utf8mb4
+
+
+[mysqld]
+collation-server = utf8mb4_unicode_ci
+init-connect='SET NAMES utf8'
+character-set-server = utf8mb4

docker-compose.yml

@@ -9,25 +9,25 @@ services:
     volumes:
       - /mnt/fotos/www:/app/data
   mysql:
-    image: jbergstroem/mariadb-alpine
+    image: mariadb
     environment:
-      SKIP_INNODB: "yes"
       MYSQL_DATABASE: fet2020db
       MYSQL_USER: user
       MYSQL_PASSWORD: hgu
       MYSQL_COLLATION: utf8_general_ci
       MYSQL_CHARSET: utf8
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     volumes:
      - ../mysql_django:/var/lib/mysql
   etherpadsql:
-    image: jbergstroem/mariadb-alpine
+    image: mariadb
     environment:
-      SKIP_INNODB: "no"
       MYSQL_DATABASE: etherpaddb
       MYSQL_USER: user
       MYSQL_PASSWORD: hgu
       MYSQL_COLLATION: utf8_general_ci
       MYSQL_CHARSET: utf8
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     volumes:
      - ../mysql_etherpad:/var/lib/mysql
   etherpad:
@@ -37,8 +37,8 @@ services:
       DB_HOST: etherpadsql
       DB_PORT: 3306
       DB_NAME: etherpaddb
-      DB_USER: user
+      DB_USER: root
-      DB_PASS: hgu
+      DB_PASS: ""
       DB_CHARSET: utf8
       #ADMIN_PASSWORD: "AndiS"
       #REQUIRE_AUTHENTICATION: "false"
@@ -51,6 +51,7 @@ services:
      - "9001:9001"
     volumes:
      - ./etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt
+     - ./deployment/mysql.cnf:/etc/mysql/conf.d
   fet2020:
     image: fet2020django
     build: .

fet2020/.theia/settings.json

@@ -4,5 +4,10 @@
     ],
     "python.testing.unittestEnabled": false,
     "python.testing.nosetestsEnabled": false,
-    "python.testing.pytestEnabled": true
+    "python.testing.pytestEnabled": true,
+    "python.pythonPath": "/usr/local/bin/python3",
+    "python.linting.pylintEnabled": true,
+    "python.linting.flake8Enabled": true,
+    "python.linting.banditEnabled": true,
+    "python.linting.enabled": true
 }