Skip to content

Commit

Permalink
Merged in docker-build-updates (pull request auth0#28)
Browse files Browse the repository at this point in the history
Moved to python 3 and mysql 8
  • Loading branch information
David Lenton committed Nov 19, 2021
2 parents ead50d3 + c906c0e commit c6a0c2d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ WORKDIR /var/www/clcdc/

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

# Install local modules
COPY package.json /var/www/clcdc/
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml.sample
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
ports:
- "6379"
#db:
# image: severalnines/mysql-pxb:5.7
# image: mysql/mysql-server:latest
# volumes:
# - ./mysql/data:/var/lib/mysql
# - ./mysql/backups:/backups
Expand Down
10 changes: 6 additions & 4 deletions mysql/my.cnf
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ port = 3306
basedir = /usr
datadir = /var/lib/mysql
tmpdir = /tmp
lc-messages-dir = /usr/share/mysql
#lc-messages-dir = /usr/share/mysql
explicit_defaults_for_timestamp
default_authentication_plugin=mysql_native_password

performance_schema = 0

Expand All @@ -50,7 +51,7 @@ net_buffer_length = 4K
read_buffer_size = 8K
read_rnd_buffer_size = 8K
sort_buffer_size = 256K
query_cache_size = 0
#query_cache_size = 0
thread_stack = 196608
max_heap_table_size = 16K
host_cache_size = 0
Expand All @@ -64,7 +65,7 @@ join_buffer_size=128
#innodb_log_group_home_dir = /var/lib/mysql
# You can set .._buffer_pool_size up to 50 - 80 %
# of RAM but beware of setting memory usage too high
innodb_buffer_pool_size = 5M
innodb_buffer_pool_size = 10M
#innodb_additional_mem_pool_size = 2M
# Set .._log_file_size to 25 % of buffer pool size
innodb_log_buffer_size = 256K
Expand All @@ -78,6 +79,7 @@ innodb_ft_total_cache_size = 32000000
# Instead of skip-networking the default is now to listen only on
# localhost which is more compatible and is not less secure.
#bind-address = 127.0.0.1
bind-address = 0.0.0.0

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

Expand All @@ -87,4 +89,4 @@ symbolic-links=0
# * IMPORTANT: Additional settings that can override those from this file!
# The files must end with '.cnf', otherwise they'll be ignored.
#
!includedir /etc/mysql/conf.d/
#!includedir /etc/mysql/conf.d/
3 changes: 3 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c6a0c2d

Please sign in to comment.