create-directus-docker 1.7.3 → 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.3",
+  "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": {

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']
@@ -99,7 +99,7 @@ services:
 
   directus:
     container_name: directus
-    image: directus/directus:11.12.0
+    image: directus/directus:11.13.0
     restart: always
     ports:
       - ${DIRECTUS_PORT}:8055
@@ -121,6 +121,8 @@ 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'

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']
@@ -62,7 +62,7 @@ services:
 
   directus:
     container_name: directus
-    image: directus/directus:11.12.0
+    image: directus/directus:11.13.0
     restart: always
     ports:
       - ${DIRECTUS_PORT}:8055
@@ -82,6 +82,8 @@ 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'

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

@@ -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:",
@@ -137,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}"`);

package/templates/default/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus-mysql-docker",
-  "version": "1.3.7",
+  "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",