Merge pull request #144 from nfdi4plants/kevinf-patch-0.4.7

Kevinf patch 0.4.7
nfdi4plants · May 12, 2021 · 78458db · 78458db
2 parents c2f0887 + 4796598
commit 78458db
Show file tree

Hide file tree

Showing 12 changed files with 810 additions and 20,747 deletions.
diff --git a/.assets/assets/manifest.xml b/.assets/assets/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <OfficeApp xmlns="http://schemas.microsoft.com/office/appforoffice/1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bt="http://schemas.microsoft.com/office/officeappbasictypes/1.0" xmlns:ov="http://schemas.microsoft.com/office/taskpaneappversionoverrides" xsi:type="TaskPaneApp">
   <Id>5d6f5462-3401-48ec-9406-d12882e9ad83</Id>
-  <Version>0.4.6</Version>
+  <Version>0.4.7</Version>
   <ProviderName>Computational Systems Biology</ProviderName>
   <DefaultLocale>en-US</DefaultLocale>
   <DisplayName DefaultValue="Swate"/>

diff --git a/.db/docker-compose.yml b/.db/docker-compose.yml
@@ -4,11 +4,11 @@ version: '3.1'
 services:
 
   db:
-    image: mysql
-    command: --default-authentication-plugin=mysql_native_password
+    image: mariadb
+    # command: --default-authentication-plugin=mysql_native_password
     restart: always
-    volumes:
-      - ./mysql-dump:/docker-entrypoint-initdb.d
+    # volumes:
+    #   - ./mysql-dump:/docker-entrypoint-initdb.d
     environment:
       MYSQL_ROOT_PASSWORD: example
     ports: