Skip to content

Commit 59da740

Browse files
committed
Use utf8mb4 as default
1 parent 48edb54 commit 59da740

File tree

3 files changed

+10
-29
lines changed

3 files changed

+10
-29
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN echo "default: &default\n\
1919
host: db\n\
2020
username: root\n\
2121
password: $PASSWORD\n\
22-
encoding: utf8\n\
22+
encoding: utf8mb4\n\
2323
\n\
2424
development:\n\
2525
<<: *default\n\

config/database.yml.example

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,15 @@
11
default: &default
22
adapter: mysql2
3-
encoding: utf8
4-
pool: 5
5-
username: your_mysql_username
6-
password: your_nysql_password
3+
username: root
4+
password: somepassword
75
socket: /var/run/mysqld/mysqld.sock
8-
6+
encoding: utf8mb4
97
development:
108
<<: *default
11-
database: tioj_development
12-
13-
9+
database: tioj_dev
1410
test:
1511
<<: *default
16-
database: tioj_test
17-
18-
19-
# On Heroku and other platform providers, you may have a full connection URL
20-
# available as an environment variable. For example:
21-
#
22-
# DATABASE_URL="mysql2://myuser:mypass@localhost/somedatabase"
23-
#
24-
# You can use this database configuration with:
25-
#
26-
# production:
27-
# url: <%= ENV['DATABASE_URL'] %>
28-
#
29-
30-
production:
31-
<<: *default
32-
database: tioj_production
33-
username: production_mysql_username
34-
password: <%= ENV['MY_APP_DATABASE_PASSWORD'] %>
12+
database: tioj_test
13+
production:
14+
<<: *default
15+
database: tioj_production

scripts/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ default: &default
125125
username: $DB_USERNAME
126126
password: $DB_PASSWORD
127127
socket: /var/run/mysqld/mysqld.sock
128-
encoding: utf8
128+
encoding: utf8mb4
129129
development:
130130
<<: *default
131131
database: tioj_dev

0 commit comments

Comments
 (0)