some random changes and fixes

2026-06-17 13:55:08 +00:00 · 2019-02-25 23:04:09 -05:00 · 2019-02-25 23:04:09 -05:00 · e13b7121af
commit e13b7121af
parent dd8da9a869
9 changed files with 12 additions and 17 deletions
--- a/4
+++ b/4
@ -3,7 +3,7 @@
 FROM ubuntu:16.04
 LABEL author=frappé

-# Generate locale C.UTF-8 for mariadb and general locale data
+# Set locale C.UTF-8 for mariadb and general locale data
 ENV LANG C.UTF-8

 # Install all neccesary packages
@ -31,7 +31,7 @@ COPY --chown=frappe:frappe ./frappe-bench /home/frappe/frappe-bench

 USER root
 # Install bench
-RUN pip install -e git+https://github.com/frappe/bench.git \
+RUN pip install -e git+https://github.com/frappe/bench.git#egg=bench \
  && rm -rf ~/.cache/pip

 USER frappe
--- a/conf/mariadb-conf.d/my.cnf
+++ b/conf/mariadb-conf.d/my.cnf
@ -27,3 +27,12 @@ collation-server = utf8mb4_unicode_ci

 [mysql]
 default-character-set = utf8mb4
+
+[mysqld_safe]
+skip_log_error
+syslog
+
+[mysqldump]
+quick
+quote-names
+max_allowed_packet	= 16M
--- a/conf/mariadb-conf.d/mysql.cnf
+++ b/conf/mariadb-conf.d/mysql.cnf
@ -1,2 +0,0 @@
-[mysql]
-
--- a/conf/mariadb-conf.d/mysqld_safe_syslog.cnf
+++ b/conf/mariadb-conf.d/mysqld_safe_syslog.cnf
@ -1,4 +0,0 @@
-[mysqld_safe]
-skip_log_error
-syslog
-
--- a/conf/mariadb-conf.d/mysqldump.cnf
+++ b/conf/mariadb-conf.d/mysqldump.cnf
@ -1,5 +0,0 @@
-[mysqldump]
-quick
-quote-names
-max_allowed_packet	= 16M
-
--- a/conf/redis-conf.d/pids/redis_cache.pid
+++ b/conf/redis-conf.d/pids/redis_cache.pid
@ -1 +0,0 @@
-20
--- a/conf/redis-conf.d/pids/redis_queue.pid
+++ b/conf/redis-conf.d/pids/redis_queue.pid
@ -1 +0,0 @@
-24
--- a/conf/redis-conf.d/pids/redis_socketio.pid
+++ b/conf/redis-conf.d/pids/redis_socketio.pid
@ -1 +0,0 @@
-29
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,4 +1,4 @@
-version: '3.3'
+version: '3.7'
 services:
  mariadb:
    image: mariadb