Skip to content

Commit c6a0c2d

Browse files
author
David Lenton
committed
Merged in docker-build-updates (pull request auth0#28)
Moved to python 3 and mysql 8
2 parents ead50d3 + c906c0e commit c6a0c2d

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ WORKDIR /var/www/clcdc/
99

1010
# Install global modules
1111
RUN npm install pm2 -g
12-
RUN apk add --no-cache make gcc g++ python2 ssmtp graphicsmagick ghostscript
12+
RUN apk add --no-cache make gcc g++ python3 ssmtp graphicsmagick ghostscript
1313

1414
# Install local modules
1515
COPY package.json /var/www/clcdc/

docker-compose.yml.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ services:
2121
ports:
2222
- "6379"
2323
#db:
24-
# image: severalnines/mysql-pxb:5.7
24+
# image: mysql/mysql-server:latest
2525
# volumes:
2626
# - ./mysql/data:/var/lib/mysql
2727
# - ./mysql/backups:/backups

mysql/my.cnf

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ port = 3306
3838
basedir = /usr
3939
datadir = /var/lib/mysql
4040
tmpdir = /tmp
41-
lc-messages-dir = /usr/share/mysql
41+
#lc-messages-dir = /usr/share/mysql
4242
explicit_defaults_for_timestamp
43+
default_authentication_plugin=mysql_native_password
4344

4445
performance_schema = 0
4546

@@ -50,7 +51,7 @@ net_buffer_length = 4K
5051
read_buffer_size = 8K
5152
read_rnd_buffer_size = 8K
5253
sort_buffer_size = 256K
53-
query_cache_size = 0
54+
#query_cache_size = 0
5455
thread_stack = 196608
5556
max_heap_table_size = 16K
5657
host_cache_size = 0
@@ -64,7 +65,7 @@ join_buffer_size=128
6465
#innodb_log_group_home_dir = /var/lib/mysql
6566
# You can set .._buffer_pool_size up to 50 - 80 %
6667
# of RAM but beware of setting memory usage too high
67-
innodb_buffer_pool_size = 5M
68+
innodb_buffer_pool_size = 10M
6869
#innodb_additional_mem_pool_size = 2M
6970
# Set .._log_file_size to 25 % of buffer pool size
7071
innodb_log_buffer_size = 256K
@@ -78,6 +79,7 @@ innodb_ft_total_cache_size = 32000000
7879
# Instead of skip-networking the default is now to listen only on
7980
# localhost which is more compatible and is not less secure.
8081
#bind-address = 127.0.0.1
82+
bind-address = 0.0.0.0
8183

8284
#log-error = /var/log/mysql/error.log
8385

@@ -87,4 +89,4 @@ symbolic-links=0
8789
# * IMPORTANT: Additional settings that can override those from this file!
8890
# The files must end with '.cnf', otherwise they'll be ignored.
8991
#
90-
!includedir /etc/mysql/conf.d/
92+
#!includedir /etc/mysql/conf.d/

package-lock.json

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)