Skip to content

Commit

Permalink
Explicitly set the charset and collation settings for MySQL DB container
Browse files Browse the repository at this point in the history
  • Loading branch information
jbernal0019 committed Jun 29, 2021
1 parent 07cae3c commit 2bc3cd8
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ secrets/
htmlcov
.docker
.idea
swarm/prod_deployments/secrets/
kubernetes/prod_deployments/secrets/
swarm/prod/secrets/
kubernetes/prod/secrets/
dc.out
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions docker-compose_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 2bc3cd8

Please sign in to comment.