(docker/dist/jwt-server) restructure and update

docker/dist/jwt-server/Makefile

@@ -18,5 +18,5 @@ setup-keycloak:
 	docker exec gfarm-keycloak /keycloak/setup.sh
 
 setup-jwt-server:
-	docker exec gfarm-jwt-server /setup.sh
-	docker exec gfarm-jwt-server2 /setup_slave.sh
+	docker exec gfarm-jwt-server /jwt/setup_master1.sh
+	docker exec gfarm-jwt-server2 /jwt/setup_master2.sh

docker/dist/jwt-server/docker-compose.yaml

@@ -22,6 +22,7 @@ services:
     container_name: gfarm-jwt-server
     volumes:
       - ../minica/minica.pem:/usr/share/pki/ca-trust-source/anchors/minica.crt
+      - ./jwt-server:/jwt
     networks:
       - gfarm_net
     privileged: true
@@ -31,6 +32,7 @@ services:
     container_name: gfarm-jwt-server2
     volumes:
       - ../minica/minica.pem:/usr/share/pki/ca-trust-source/anchors/minica.crt
+      - ./jwt-server:/jwt
     networks:
       - gfarm_net
     privileged: true

docker/dist/jwt-server/jwt-server/Dockerfile

@@ -15,12 +15,7 @@ RUN cd jwt-server \
  && mvn package \
  && cp target/jwt-server.war /usr/share/tomcat/webapps/ROOT.war
 
-COPY my.cnf.d/ /
-COPY init.sql /jwt-server/ddl/
-COPY init_master.sql /jwt-server/ddl/
-COPY init_slave.sql /jwt-server/ddl/
-COPY setup.sh /
-COPY setup_slave.sh /
+COPY cnf/charset.cnf /etc/my.cnf.d/
 
 RUN systemctl enable httpd \
  && systemctl enable tomcat \

docker/dist/jwt-server/jwt-server/application.properties

@@ -10,7 +10,7 @@ keycloak.credentials.secret=eJxl5z1EHU0u6BVLpR5MG0v4NLgCZWWG
 user-claim=hpci.id
 
 # contact address
-contact-info=
+contact-info=gfarmfs@gmail.com
 
 # set redundant jwt-server's URLs
 replicated-jwt-servers=http://jwt-server/ http://jwt-server2/

docker/dist/jwt-server/jwt-server/cnf/charset.cnf

@@ -0,0 +1,6 @@
+[mysqld]
+character-set-server=utf8mb4
+skip-character-set-client-handshake
+
+[client]
+default-character-set = utf8mb4

docker/dist/jwt-server/jwt-server/setup.sh

@@ -10,11 +10,5 @@ systemctl restart tomcat
 while [ ! -e /var/lib/mysql/mysql.sock ]; do
 	sleep 1
 done
-cd jwt-server/ddl
-mysql < init.sql
-mysql -u gfarm -pgfarm123 gfarmdb < jwt-server.ddl
-
-cp /mysql_master.cnf /etc/my.cnf.d/
-systemctl restart mysql
-
-mysql < init_master.sql
+mysql < /jwt/sql/init.sql
+mysql -u gfarm -pgfarm123 gfarmdb < /jwt-server/ddl/jwt-server.ddl

docker/dist/jwt-server/jwt-server/setup_master1.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -xeu
+/jwt/setup.sh
+
+cp /jwt/cnf/master1.cnf /etc/my.cnf.d/
+systemctl restart mysql
+
+mysql < /jwt/sql/init_master1.sql

docker/dist/jwt-server/jwt-server/setup_master2.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -xeu
+/jwt/setup.sh
+
+cp /jwt/cnf/master2.cnf /etc/my.cnf.d/
+systemctl restart mysql
+
+mysql < /jwt/sql/init_master2.sql

docker/dist/jwt-server/jwt-server/sql/init_master1.sql

@@ -0,0 +1,11 @@
+CREATE USER 'replica'@'%' IDENTIFIED BY 'gfarm123';
+RESET MASTER;
+GRANT REPLICATION SLAVE ON *.* TO 'replica'@'%';
+CHANGE MASTER TO
+  MASTER_HOST = 'jwt-server2',
+  MASTER_PORT = 3306,
+  MASTER_USER = 'replica',
+  MASTER_PASSWORD = 'gfarm123',
+  MASTER_CONNECT_RETRY = 10,
+  MASTER_USE_GTID = slave_pos;
+START SLAVE;

docker/dist/jwt-server/jwt-server/sql/init_master2.sql

@@ -0,0 +1,11 @@
+CREATE USER 'replica'@'%' IDENTIFIED BY 'gfarm123';
+RESET MASTER;
+GRANT REPLICATION SLAVE ON *.* TO 'replica'@'%';
+CHANGE MASTER TO
+  MASTER_HOST = 'jwt-server',
+  MASTER_PORT = 3306,
+  MASTER_USER = 'replica',
+  MASTER_PASSWORD = 'gfarm123',
+  MASTER_CONNECT_RETRY = 10,
+  MASTER_USE_GTID = slave_pos;
+START SLAVE;