create-directus-docker 1.7.2 → 1.7.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-directus-docker",
   "description": "An installer for Dockerized Directus + MySQL + Adminer + GraphQL Sandbox with a helper Node app",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "type": "module",
   "author": {
     "name": "Dave Kobrenski",
@@ -19,7 +19,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/rollmug/directus-mysql-template"
+    "url": "git+https://github.com/rollmug/directus-mysql-template.git"
   },
   "homepage": "https://github.com/rollmug/directus-mysql-template#readme",
   "scripts": {
@@ -30,6 +30,7 @@
     "copy:compose-nginx": "copy-file ../directus-mysql-template/docker-compose-nginx.yml ./templates/default/docker-compose-nginx.yml",
     "copy:readme": "copy-file ../directus-mysql-template/README.md ./templates/default/README.md",
     "copy:lib": "copyfiles --flat ../directus-mysql-template/lib/*.js ./templates/default/lib",
+    "copy:redis": "copyfiles --flat ../directus-mysql-template/redis/* ./templates/default/redis",
     "copy:conf": "copy-file ../directus-mysql-template/custom_proxy_settings.conf ./templates/default/custom_proxy_settings.conf"
   },
   "files": [

package/templates/default/docker-compose-nginx.yml

@@ -39,7 +39,7 @@ services:
 
   mysql:
     container_name: mysql
-    image: mysql:9.1.0
+    image: mysql:9.5.0
     restart: always
     healthcheck: 
       test: ['CMD', 'mysqladmin', 'ping', '--silent']
@@ -52,9 +52,8 @@ services:
     ports:
       - 3306:3306
     volumes:
-      - ./mysql:/var/lib/mysql
+      - mysql-data:/var/lib/mysql
       - ./init:/docker-entrypoint-initdb.d
-    # command: --mysql-native-password=ON
     environment:
       MYSQL_USER: ${MYSQL_USER}
       MYSQL_PASSWORD: ${MYSQL_PASS}
@@ -79,20 +78,28 @@ services:
 
   cache:
     container_name: cache
-    image: redis:6.2.6
+    build:
+      context: ./redis
+    restart: always
+    privileged: true
+    environment:
+      REDIS_PASSWORD: ${REDIS_PASSWORD}
+    command: ["sh", "-c", "./init.sh"]
     healthcheck:
-      test: ["CMD-SHELL", "[ $$(redis-cli ping) = 'PONG' ]"]
+      test: ["CMD", "redis-cli", "-a", "${REDIS_PASSWORD}", "ping"]
       interval: 10s
       timeout: 5s
       retries: 5
       start_interval: 5s
       start_period: 30s
+    volumes:
+      - redis_data:/data:rw
     networks:
       - directus
 
   directus:
     container_name: directus
-    image: directus/directus:11.3.5
+    image: directus/directus:11.13.0
     restart: always
     ports:
       - ${DIRECTUS_PORT}:8055
@@ -114,9 +121,12 @@ services:
       DB_CLIENT: 'mysql'
       DB_HOST: 'mysql'
       DB_USER: ${MYSQL_USER}
+      PROJECT_OWNER: ${PROJECT_OWNER}
+      ACCEPT_TERMS: 'true'
       DB_PASSWORD: ${MYSQL_PASS}
       DB_DATABASE: ${MYSQL_DB}
       DB_PORT: '3306'
+      REDIS_PASSWORD: ${REDIS_PASSWORD}
 
       VIRTUAL_HOST: ${VIRTUAL_HOST}
       VIRTUAL_PORT: ${DIRECTUS_PORT}
@@ -125,7 +135,7 @@ services:
 
       CACHE_ENABLED: 'true'
       CACHE_STORE: 'redis'
-      REDIS: 'redis://cache:6379'
+      REDIS: 'redis://default:${REDIS_PASSWORD}@cache:6379'
       CACHE_AUTO_PURGE: 'true'
       CACHE_SYSTEM_TTL: '2m'
       CACHE_SCHEMA: 'false'
@@ -152,4 +162,6 @@ volumes:
     vhost:
     html:
     certs:
-    acme:
+    acme:
+    redis_data:
+    mysql-data:

package/templates/default/docker-compose.yml

@@ -2,7 +2,7 @@ services:
 
   mysql:
     container_name: mysql
-    image: mysql:9.1.0
+    image: mysql:9.5.0
     restart: always
     healthcheck: 
       test: ['CMD', 'mysqladmin', 'ping', '--silent']
@@ -17,7 +17,6 @@ services:
     volumes:
       - mysql-data:/var/lib/mysql
       - ./init:/docker-entrypoint-initdb.d
-    # command: --mysql-native-password=ON
     environment:
       MYSQL_USER: ${MYSQL_USER}
       MYSQL_PASSWORD: ${MYSQL_PASS}
@@ -42,20 +41,28 @@ services:
 
   cache:
     container_name: cache
-    image: redis:6.2.19
+    build:
+      context: ./redis
+    restart: always
+    privileged: true
+    environment:
+      REDIS_PASSWORD: ${REDIS_PASSWORD}
+    command: ["sh", "-c", "REDIS_PASSWORD=${REDIS_PASSWORD} ./init.sh"]
     healthcheck:
-      test: ["CMD-SHELL", "[ $$(redis-cli ping) = 'PONG' ]"]
+      test: ["CMD", "redis-cli", "-a", "${REDIS_PASSWORD}", "ping"]
       interval: 10s
       timeout: 5s
       retries: 5
       start_interval: 5s
       start_period: 30s
+    volumes:
+      - redis_data:/data:rw
     networks:
       - directus
 
   directus:
     container_name: directus
-    image: directus/directus:11.12.0
+    image: directus/directus:11.13.0
     restart: always
     ports:
       - ${DIRECTUS_PORT}:8055
@@ -75,13 +82,16 @@ services:
       DB_CLIENT: 'mysql'
       DB_HOST: 'mysql'
       DB_USER: ${MYSQL_USER}
+      PROJECT_OWNER: ${PROJECT_OWNER}
+      ACCEPT_TERMS: 'true'
       DB_PASSWORD: ${MYSQL_PASS}
       DB_DATABASE: ${MYSQL_DB}
       DB_PORT: '3306'
+      REDIS_PASSWORD: ${REDIS_PASSWORD}
 
       CACHE_ENABLED: 'true'
       CACHE_STORE: 'redis'
-      REDIS: 'redis://cache:6379'
+      REDIS: 'redis://default:${REDIS_PASSWORD}@cache:6379'
       CACHE_AUTO_PURGE: 'true'
       CACHE_SYSTEM_TTL: '2m'
       CACHE_SCHEMA: 'false'
@@ -102,6 +112,7 @@ services:
 
 volumes:
   mysql-data:
+  redis_data:
 networks:
   directus:
     driver: bridge

package/templates/default/env-sample.txt

@@ -1,5 +1,9 @@
 # This is a sample .env file with all possible options
 
+# Directus Instance Owner
+# this is to comply with the Directus BSL License 1.1 
+PROJECT_OWNER="you@email"
+
 # Email and password to login to Directus:
 ADMIN_EMAIL="you@email"
 ADMIN_PASSWORD="s0mEpa55w0rd"
@@ -14,6 +18,9 @@ MYSQL_DB="directus"
 # Set a root password for MySQL to something secure:
 MYSQL_ROOT_PASS="s0mEpa55w0rd"
 
+# Set a password for redis
+REDIS_PASSWORD="s0mEpa55w0rd"
+
 # Set the domain for directus to use:
 # eg, https://mydomain.com
 # in local dev environments, just leave it set to localhost:port

package/templates/default/lib/index.js

@@ -43,11 +43,11 @@ try {
         let git = await gitData();
         let mode = 0o777;
 
-        if (fs.existsSync(path.join(rootPath, 'mysql')) === false) {
-            fs.mkdir(path.join(rootPath, 'mysql'), () => {
-                //console.log(`'mysql' directory created.`);
-            });
-        }
+        // if (fs.existsSync(path.join(rootPath, 'mysql')) === false) {
+        //     fs.mkdir(path.join(rootPath, 'mysql'), () => {
+        //         //console.log(`'mysql' directory created.`);
+        //     });
+        // }
 
         if (fs.existsSync(path.join(rootPath, 'directus')) === false) {
             fs.mkdir(path.join(rootPath, 'directus'), { mode }, () => {
@@ -97,6 +97,21 @@ try {
                     }
                 }
             },
+            {
+                name: 'PROJECT_OWNER',
+                message: "Directus Instance Owner (email):",
+                default: git.email,
+                validate: (email) => {
+                    let valid = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(email)
+
+                    if (valid) {
+                        return true;
+                    } else {
+                        console.log(chalk.red("\nPlease enter a valid email."))
+                        return false;
+                    }
+                }
+            },
             {
                 name: 'MYSQL_USER',
                 message: "Specify a user name for your MySQL database:",
@@ -117,6 +132,11 @@ try {
                 message: "Root password:",
                 default: generator.generate({ length: 14, numbers: true, symbols: false })
             },
+            {
+                name: 'REDIS_PASSWORD',
+                message: "Redis cache password:",
+                default: generator.generate({ length: 14, numbers: true, symbols: false })
+            },
             {
                 name: 'DIRECTUS_DOMAIN',
                 message: "Web address to run on. For example, 'https://mydomain.com' Leave as localhost if running in dev environment.",
@@ -132,7 +152,10 @@ try {
             console.log(answers);
 
             var writeStream = fs.createWriteStream(envPath);
-            writeStream.write("# Environment variables\n\n# Email and password to login to Directus:\n");
+            writeStream.write("# Environment variables\n\n# Directus Instance Owner\n# This is to comply with the Directus BSL License 1.1\n");
+            writeStream.write(`PROJECT_OWNER="${answers.PROJECT_OWNER}"`);
+            writeStream.write("\n\n");
+            writeStream.write("# Email and password to login to Directus:\n");
             writeStream.write(`ADMIN_EMAIL="${answers.ADMIN_EMAIL}"`);
             writeStream.write("\n");
             writeStream.write(`ADMIN_PASSWORD="${answers.ADMIN_PASSWORD}"`);
@@ -156,6 +179,9 @@ try {
             writeStream.write(`MYSQL_ROOT_PASS="${answers.MYSQL_ROOT_PASS}"`);
             writeStream.write("\n\n");
 
+            writeStream.write("# Set a password for redis. Make sure this matches the password in the redis/init.sh file\n");
+            writeStream.write(`REDIS_PASSWORD="${answers.REDIS_PASSWORD}"\n\n`);
+
             writeStream.write("# Set the domain for directus to use:\n");
             writeStream.write("# eg, https://mydomain.com\n");
             writeStream.write("# in local dev environments, just leave it set to localhost:port\n");

package/templates/default/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus-mysql-docker",
-  "version": "1.3.6",
+  "version": "1.4.0",
   "description": "A helper app to configure Directus on Docker with MySQL, Adminer, and Apollo GraphQL Sandbox",
   "main": "./lib/index.js",
   "type": "module",

package/templates/default/redis/Dockerfile

@@ -0,0 +1,5 @@
+FROM redis:8.2.1-alpine
+WORKDIR /redis
+COPY redis.conf /usr/local/etc/redis/redis.conf
+COPY init.sh ./
+RUN chmod +x init.sh

package/templates/default/redis/init.sh

@@ -0,0 +1,30 @@
+#  WARNING you have Transparent Huge Pages (THP) support enabled in your kernel.
+#  This will create latency and memory usage issues with Redis.
+#  To fix this issue run the command 'echo never > /sys/kernel/mm/transparent_hugepage/enabled' as root,
+#  and add it to your /etc/rc.local in order to retain the setting after a reboot.
+#  Redis must be restarted after THP is disabled.
+
+echo never > /sys/kernel/mm/transparent_hugepage/enabled
+echo never > /sys/kernel/mm/transparent_hugepage/defrag
+
+# WARNING: The TCP backlog setting of 511 cannot be enforced
+# because /proc/sys/net/core/somaxconn is set to the lower value of 128.
+
+sysctl -w net.core.somaxconn=512
+
+# WARNING overcommit_memory is set to 0! Background save may fail under low memory condition.
+# To fix this issue add 'vm.overcommit_memory = 1' to /etc/sysctl.conf and then reboot
+# or run the command 'sysctl vm.overcommit_memory=1' for this to take effect.
+# The overcommit_memory has 3 options.
+# 0, the system kernel check if there is enough memory to be allocated to the process or not, 
+# if not enough, it will return errors to the process.
+# 1, the system kernel is allowed to allocate the whole memory to the process
+# no matter what the status of memory is.
+# 2, the system kernel is allowed to allocate a memory whose size could be bigger than
+# the sum of the size of physical memory and the size of exchange workspace to the process.
+
+sysctl vm.overcommit_memory=1
+
+# start redis server
+
+redis-server /usr/local/etc/redis/redis.conf --loglevel warning --bind 0.0.0.0 --requirepass $REDIS_PASSWORD