diff --git a/Dockerfile b/Dockerfile index a595b5b1..67c013dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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/ diff --git a/docker-compose.yml.sample b/docker-compose.yml.sample index a3d43c02..15c22c9d 100644 --- a/docker-compose.yml.sample +++ b/docker-compose.yml.sample @@ -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 diff --git a/mysql/my.cnf b/mysql/my.cnf index 7d62d348..e8de5c62 100644 --- a/mysql/my.cnf +++ b/mysql/my.cnf @@ -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 @@ -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 @@ -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 @@ -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 @@ -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/ \ No newline at end of file +#!includedir /etc/mysql/conf.d/ \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index a9c2ac5c..571bccc4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "clcdc", "dependencies": { "@sendgrid/mail": "^6.5.5", "apple-signin-auth": "^1.0.6", @@ -11548,6 +11549,7 @@ }, "node_modules/node-sass": { "version": "6.0.1", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-6.0.1.tgz", "integrity": "sha512-f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ==", "hasInstallScript": true, "dependencies": { @@ -25396,6 +25398,7 @@ }, "node-sass": { "version": "6.0.1", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-6.0.1.tgz", "integrity": "sha512-f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ==", "requires": { "async-foreach": "^0.1.3",