From 2bc3cd8c1fbb253a1ec9edc7ea223b7d539b3db4 Mon Sep 17 00:00:00 2001
From: Jorge <jbernal0019@yahoo.es>
Date: Tue, 29 Jun 2021 19:58:57 -0400
Subject: [PATCH] Explicitly set the charset and collation settings for MySQL
 DB container

---
 .dockerignore                                       | 4 ++--
 .gitignore                                          | 4 ++--
 README.md                                           | 2 +-
 deploy.sh                                           | 6 +++---
 docker-compose_dev.yml                              | 1 +
 swarm/{prod_deployments => prod}/docker-compose.yml | 1 +
 6 files changed, 10 insertions(+), 8 deletions(-)
 rename swarm/{prod_deployments => prod}/docker-compose.yml (96%)

diff --git a/.dockerignore b/.dockerignore
index ec8847f..df7a104 100755
--- a/.dockerignore
+++ b/.dockerignore
@@ -10,6 +10,6 @@ README.md
 utils
 docs
 htmlcov
-swarm/prod_deployments/secrets
-kubernetes/prod_deployments/secrets
+swarm/prod/secrets
+kubernetes/prod/secrets
 dc.out
diff --git a/.gitignore b/.gitignore
index ac6ba0a..638ba00 100755
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,6 @@ secrets/
 htmlcov
 .docker
 .idea
-swarm/prod_deployments/secrets/
-kubernetes/prod_deployments/secrets/
+swarm/prod/secrets/
+kubernetes/prod/secrets/
 dc.out
diff --git a/README.md b/README.md
index d31425b..7d28176 100755
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ cd ChRIS_store
 Create ``secrets`` directory:
 
 ```bash
-mkdir swarm/prod_deployments/secrets
+mkdir swarm/prod/secrets
 ```
 
 Now copy all the required secret configuration files into the ``secrets`` directory, please take a look at 
diff --git a/deploy.sh b/deploy.sh
index 5bb361a..4d31caf 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -34,10 +34,10 @@ declare -i STEP=0
 
 if [[ "$1" == 'up' ]]; then
 
-    title -d 1 "Starting containerized production environment on using " " swarm/prod_deployments/docker-compose.yml"
+    title -d 1 "Starting containerized production environment on using " " swarm/prod/docker-compose.yml"
     echo ""
-    echo "docker stack deploy -c swarm/prod_deployments/docker-compose.yml chris_store_stack"
-    docker stack deploy -c swarm/prod_deployments/docker-compose.yml chris_store_stack
+    echo "docker stack deploy -c swarm/prod/docker-compose.yml chris_store_stack"
+    docker stack deploy -c swarm/prod/docker-compose.yml chris_store_stack
     windowBottom
 
     title -d 1 "Waiting until chris store stack containers are running on swarm"
diff --git a/docker-compose_dev.yml b/docker-compose_dev.yml
index d1a53ce..c017efb 100755
--- a/docker-compose_dev.yml
+++ b/docker-compose_dev.yml
@@ -36,6 +36,7 @@ services:
 
   chris_store_dev_db:
     image: mysql:5
+    command: --character-set-server=utf8 --collation-server=utf8_bin
     volumes:
       - chris_store_dev_db_data:/var/lib/mysql:z
     environment:
diff --git a/swarm/prod_deployments/docker-compose.yml b/swarm/prod/docker-compose.yml
similarity index 96%
rename from swarm/prod_deployments/docker-compose.yml
rename to swarm/prod/docker-compose.yml
index eccd893..b259c46 100755
--- a/swarm/prod_deployments/docker-compose.yml
+++ b/swarm/prod/docker-compose.yml
@@ -35,6 +35,7 @@ services:
 
   chris_store_db:
     image: mysql:5
+    command: --character-set-server=utf8 --collation-server=utf8_bin
     volumes:
       - chris_store_db_data:/var/lib/mysql
     env_file: