Skip to content

Commit

Permalink
Merge pull request #137 from usdot-fhwa-OPS/develop
Browse files Browse the repository at this point in the history
corrected arm initialization
  • Loading branch information
jtbaird authored Mar 26, 2020
2 parents 56bcb27 + 7b1f029 commit 32f8642
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions configuration/arm64/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ services:
- "mysql_db:/var/lib/mysql"
- ./mysql/install_db.sh:/docker-entrypoint-initdb.d/install_db.sh
- ./mysql/localhost.sql:/docker-entrypoint-initdb.d/localhost.sql
- ./mysql/script_credentials.sh:/docker-entrypoint-initdb.d/script_credentials.sh

volumes:
mysql_db:
1 change: 0 additions & 1 deletion configuration/arm64/mysql/install_db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
mysql -uroot -pivp --silent -e "SHOW STATUS WHERE Variable_name = 'Uptime' and Value > 0;"
mysql -uroot -pivp -e "CREATE DATABASE IF NOT EXISTS IVP; GRANT ALL PRIVILEGES ON IVP.* To 'IVP'@'127.0.0.1' IDENTIFIED BY 'ivp';"
mysql -v -uIVP -pivp IVP < /docker-entrypoint-initdb.d/localhost.sql
mysql -uroot -pivp --silent -e "INSERT INTO IVP.user (IVP.user.username, IVP.user.password, IVP.user.accessLevel) VALUES('$username', '$password', 3)"
2 changes: 2 additions & 0 deletions configuration/arm64/mysql/script_credentials.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh -x
mysql -uroot -pivp --silent -e "INSERT INTO IVP.user (IVP.user.username, IVP.user.password, IVP.user.accessLevel) VALUES('$username', '$password', 3)"
1 change: 1 addition & 0 deletions configuration/arm64/post-initialization.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ services:
- "mysql_db:/var/lib/mysql"
- ./mysql/install_db.sh:/docker-entrypoint-initdb.d/install_db.sh
- ./mysql/localhost.sql:/docker-entrypoint-initdb.d/localhost.sql
- ./mysql/script_credentials.sh:/docker-entrypoint-initdb.d/script_credentials.sh

php:
image: php:7.2.2-apache
Expand Down

0 comments on commit 32f8642

Please sign in to comment.