create-directus-docker 1.3.4 → 1.3.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-directus-docker",
   "description": "An installer for Dockerized Directus + MySQL + Adminer + GraphiQL with a helper Node app",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "type": "module",
   "author": {
     "name": "Dave Kobrenski",

package/templates/default/docker-compose.yml

@@ -7,7 +7,7 @@ services:
     image: mysql:8
     restart: always
     healthcheck: 
-      test: ['mysqladmin', 'ping', '--silent']
+      test: ['CMD', 'mysqladmin', 'ping', '--silent']
       interval: 5s
       timeout: 20s
       retries: 3
@@ -47,8 +47,9 @@ services:
   directus:
     container_name: directus
     image: directus/directus:latest
+    restart: always
     ports:
-      - 8055:8055
+      - ${DIRECTUS_PORT}:8055
     volumes:
       - ./directus/uploads:/directus/uploads
     networks:
@@ -72,7 +73,7 @@ services:
       ADMIN_EMAIL: ${ADMIN_EMAIL}
       ADMIN_PASSWORD: ${ADMIN_PASSWORD}
       CORS_ENABLED: 'true'
-      CORS_ORIGIN: '*'
+      CORS_ORIGIN: 'true'
 
       PUBLIC_URL: ${PUBLIC_URL}
 

package/templates/default/lib/index.js

@@ -103,6 +103,16 @@ try {
                 name: 'MYSQL_ROOT_PASS',
                 message: "Root 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.",
+                default: 'localhost'
+            },
+            {
+                name: 'DIRECTUS_PORT',
+                message: "Port to access Directus on:",
+                default: '8055'
             }
         ]).then(answers => {
             console.log(chalk.magentaBright("\nWriting to environment file. Be sure to take note of your credentials below, you'll need them shortly!\n"));
@@ -136,12 +146,29 @@ try {
             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");
-            writeStream.write("PUBLIC_URL=\"http://localhost:8055\"\n");
-            writeStream.write("API_ENDPOINT=\"http://localhost:8055/graphql\"");
+            writeStream.write(`DIRECTUS_DOMAIN="${answers.DIRECTUS_DOMAIN}"\n`);
+            writeStream.write(`DIRECTUS_PORT="${answers.DIRECTUS_PORT}"\n`);
+
+            if(answers.DIRECTUS_DOMAIN === "localhost") {
+                if(answers.DIRECTUS_PORT === 80) {
+                    writeStream.write(`PUBLIC_URL="http://localhost"\n`);
+                    writeStream.write(`API_ENDPOINT="http://localhost/graphql"`);
+                } else {
+                    writeStream.write(`PUBLIC_URL="http://localhost:${answers.DIRECTUS_PORT}"\n`);
+                    writeStream.write(`API_ENDPOINT="http://localhost:${answers.DIRECTUS_PORT}/graphql"`);
+                }
+            } else {
+                if(answers.DIRECTUS_PORT === 80) {
+                    writeStream.write(`PUBLIC_URL="${answers.DIRECTUS_DOMAIN}"\n`);
+                    writeStream.write(`API_ENDPOINT="${answers.DIRECTUS_DOMAIN}/graphql"`);
+                } else {
+                    writeStream.write(`PUBLIC_URL="${answers.DIRECTUS_DOMAIN}:${answers.DIRECTUS_PORT}"\n`);
+                    writeStream.write(`API_ENDPOINT="${answers.DIRECTUS_DOMAIN}:${answers.DIRECTUS_PORT}/graphql"`);
+                }        
+            }
 
             writeStream.end();
 
-            //console.log(chalk.greenBright("\nAll set!"));
             console.log("\nYou can always edit the variables that we've just set in the .env file manually.\n");
 
             inquirer.prompt([

package/templates/default/lib/launch-services.js

@@ -5,9 +5,11 @@ import { spawn } from 'node:child_process';
 import logUpdate from 'log-update';
 import open from 'open';
 import inquirer from 'inquirer';
+import * as dotenv from 'dotenv';
+dotenv.config();
 
 export default function launchServices() {
-    const launch = spawn('docker', ['compose', 'up', 'mysql', '-d']);
+    const launch = spawn('docker-compose', ['up', '-d', 'mysql']);
 
     const opts = {
         resources: [
@@ -42,7 +44,7 @@ export default function launchServices() {
                 logUpdate("Building and launching containers:\n");
                 logUpdate.done();
 
-                const launch2 = spawn('docker', ['compose', 'up', '-d']);
+                const launch2 = spawn('docker-compose', ['up', '-d']);
 
                 launch2.stderr.on('data', (data) => {
                     logUpdate(`${data}`);
@@ -52,9 +54,15 @@ export default function launchServices() {
                     logUpdate('Done.');
                     logUpdate.done();
 
+                    if(process.env.DIRECTUS_DOMAIN === 'localhost') {
+                        var appURL = 'http://localhost';
+                    } else {
+                        var appURL = process.env.DIRECTUS_DOMAIN;
+                    }
+
                     const pingOpts = {
                         resources: [
-                            'http://localhost:8055'
+                            `${process.env.PUBLIC_URL}`
                         ],
                         delay: 1000,
                         interval: 300,
@@ -70,10 +78,9 @@ export default function launchServices() {
                         logUpdate.done();
 
                         console.log(chalk.green("\nAll services should be ready. You can access them at the following URLs:\n"));
-
-                        console.log(`Directus CMS: ${chalk.cyan("http://localhost:8055")}`);
-                        console.log(`Adminer: ${chalk.cyan("http://localhost:8080")}`);
-                        console.log(`GraphiQL Playground: ${chalk.cyan("http://localhost:4000/graphql")}`);
+                        console.log(`Directus CMS: ${chalk.cyan(process.env.PUBLIC_URL)}`);
+                        console.log(`Adminer: ${chalk.cyan(appURL + ":8080")}`);
+                        console.log(`GraphiQL Playground: ${chalk.cyan(appURL + ":4000/graphql")}`);
 
                         console.log(`\n${chalk.redBright("Note: learn how to avoid CORS errors in the GraphiQL Playground when running on localhost:")}`);
                         console.log(`https://github.com/rollmug/directus-mysql-template#cors-problems-on-localhost`)
@@ -91,9 +98,9 @@ export default function launchServices() {
                             }
                         ]).then(answers => {
                             if(answers.open_now === true) {
-                                open('http://localhost:8055');
-                                open('http://localhost:8080');
-                                open('http://localhost:4000/graphql');
+                                open(process.env.PUBLIC_URL);
+                                open(`${appURL}:8080`);
+                                open(`${appURL}:4000/graphql`);
                             } else {
                                 process.exit(1);
                             }