Tweak Dockerfile and docker-compose.yml

biodiversitydata-se · Oct 27, 2023 · e306197 · e306197
1 parent 5b3a9b7
commit e306197
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -15,4 +15,4 @@ RUN apt-get update \
 
 EXPOSE 9000
 
-CMD ["sh", "-c", "java -Djava.util.logging.config.file=/data/cas/config/log4j2.xml -Dcas.standalone.configurationDirectory=/data/cas/config -Dala.password.properties=/data/cas/config/pwe.properties -jar /app/cas-exec.war"]
+CMD ["sh", "-c", "java -Dcas.standalone.configurationDirectory=/data/cas/config -Dala.password.properties=/data/cas/config/pwe.properties -jar /app/cas-exec.war"]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,14 +4,14 @@ services:
     image: mysql:8.0
     volumes:
       - db_data_cas:/var/lib/mysql
-      #- /home/mats/Documents/sbdi/ala-cas-5/emmet-dump__231018.sql:/tmp/emmet-dump__231018.sql
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: 1
       MYSQL_DATABASE: emmet
       MYSQL_USER: cas
       MYSQL_PASSWORD: cas
     ports:
       - 3306:3306
+    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
 
   mongodb:
     image: mongo:4
@@ -20,7 +20,6 @@ services:
       MONGO_INITDB_ROOT_PASSWORD: cas
     volumes:
       - db_data_mongo_cas:/data/db
-      #- /home/mats/Documents/sbdi/ala-cas-5/mongodbcas-dump__231018:/tmp/mongodbcas-dump__231018
     ports:
       - 27017:27017
 
@@ -36,9 +35,10 @@ services:
     volumes:
       - ./sbdi/data/config/application.yml:/data/cas/config/application.yml
       - ./sbdi/data/config/pwe.properties:/data/cas/config/pwe.properties
-      - ./etc/cas/config/log4j2.xml:/data/cas/config/log4j2.xml
-      - ./etc/cas/config/cas.properties:/data/cas/config/cas.properties
+      - ./sbdi/data/config/log4j2.xml:/data/cas/config/log4j2.xml
 
 volumes:
   db_data_cas:
   db_data_mongo_cas:
+  #db_data_cas_empty:
+  #db_data_mongo_cas_empty:
diff --git a/sbdi/README.md b/sbdi/README.md
@@ -9,8 +9,7 @@ mats@xps-13:/data/cas$ tree
 .
 ├── config
     ├── application.yml -> /home/mats/src/biodiversitydata-se/ala-cas-5/sbdi/data/config/application.yml
-    ├── cas.properties -> /home/mats/src/biodiversitydata-se/ala-cas-5/etc/cas/config/cas.properties
-    ├── log4j2.xml -> /home/mats/src/biodiversitydata-se/ala-cas-5/etc/cas/config/log4j2.xml
+    ├── log4j2.xml -> /home/mats/src/biodiversitydata-se/ala-cas-5/sbdi/data/config/log4j2.xml
     └── pwe.properties -> /home/mats/src/biodiversitydata-se/ala-cas-5/sbdi/data/config/pwe.properties
 ```
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,4 @@ RUN apt-get update \

		EXPOSE 9000

		CMD ["sh", "-c", "java -Djava.util.logging.config.file=/data/cas/config/log4j2.xml -Dcas.standalone.configurationDirectory=/data/cas/config -Dala.password.properties=/data/cas/config/pwe.properties -jar /app/cas-exec.war"]
		CMD ["sh", "-c", "java -Dcas.standalone.configurationDirectory=/data/cas/config -Dala.password.properties=/data/cas/config/pwe.properties -jar /app/cas-exec.war"]