@fishawack/lab-env 4.14.0 → 4.15.0

package/CHANGELOG.md

@@ -1,5 +1,68 @@
 ## Changelog
 
+### 4.15.0 (2023-03-23)
+* [Feature] moved wordpress to new version folder and build into standalone image
+* [Feature] drupal apache now a multi arch build with changelog
+* [Feature] can now pass --container flag to exec command to pipe commands into different containers
+* [Feature] intercept chgrp commands and pipe into node container
+* [Feature] export user mapping of containers to uids
+* [Feature] copy .env regardless of project if it exists in the project root
+* [Feature] _.command can now handle no command which just starts a bash terminal
+* [Feature] can now ignore errors in commands
+* [Feature] commands now a global function that can accept container and command
+* [Change] Bumped fishawack/lab-env-craftcms-3-apache to 1.0.0
+* [Change] Bumped fishawack/lab-env-craftcms-3-php to 1.0.0
+* [Change] Bumped fishawack/lab-env-wordpress-0 to 1.0.0
+* [Change] Bumped fishawack/lab-env-drupal-9-php to 0.6.0
+* [Change] Bumped fishawack/lab-env-laravel-8-php to 0.4.1
+* [Change] Bumped fishawack/lab-env-laravel-8-php to 0.4.0
+* [Change] Bumped fishawack/lab-env-core-1 to 1.3.0
+* [Bug] added craft versions to global.js
+* [Bug] craft now publishes to standalone images and uses apache
+* [Bug] switch to mysql 8.0.32 for drupal for arm64 arch
+* [Bug] added versions to drupal images in compose files
+* [Bug] remove dev Dockerfiles as default docker compose can handle them now
+* [Bug] remove platform from wordpress image to allow it to be chosen by platform
+* [Bug] map user id and group to wordpress container to Bug permission issues
+* [Bug] remove redundant htaccess file
+* [Bug] removed duplicate keys in wordpress
+* [Bug] drupal php now maps env variables correctly
+* [Bug] dont map platforms to drupal containers
+* [Bug] drupal php now a multi arch build with changelog
+* [Bug] dont log ports after first launch
+* [Bug] dont re-set ports on running containers as it can cause error if core is stopped and redundant anyway
+* [Bug] wp now correctly maps container user
+* [Bug] connect now correctly maps container user
+* [Bug] mocha now correctly maps container user
+* [Bug] watch command now ups containers on full stack projects
+* [Bug] watch now correctly maps container user
+* [Bug] uninstall now correctly maps container user
+* [Bug] start now correctly maps container user
+* [Bug] setup now correctly maps container user
+* [Bug] run now correctly maps container user
+* [Bug] npm now correctly maps container user
+* [Bug] production now correctly maps container user
+* [Bug] install now correctly maps container user
+* [Bug] content now correctly maps container user
+* [Bug] correctly check composer deps and list out missing when -v flag passed in
+* [Bug] check now correctly maps container user
+* [Bug] remap method in command func to take into account changing running variable
+* [Bug] test now correctly maps container user
+* [Bug] reinstall now correctly maps container user
+* [Bug] regenerate now correctly maps container user
+* [Bug] drush now correctly maps container user
+* [Bug] deploy now correctly maps container user
+* [Bug] craft now correctly maps container user
+* [Bug] clean now correctly maps container user
+* [Bug] dont join -g prep between commands as not needed and causes invalid task calls
+* [Bug] correctly set and unset running during up node commands to ensure other functions work as expected
+* [Bug] php now correctly maps container user
+* [Bug] composer now correctly maps container user
+* [Bug] artisan now correctly maps container user
+* [Bug] updated lab-env-laravel-nginx build image script to be multi arch
+* [Bug] updated lab-env-laravel-php build image script to be multi arch
+* [Bug] no longer specify platform on laravel projects for nginx, php and redis images
+
 ### 4.14.0 (2023-03-02)
 * [Change] Bumped fishawack/lab-env-laravel-8-nginx to 0.1.2
 * [Change] Bumped fishawack/lab-env-laravel-8-php to 0.3.1

package/commands/artisan.js

@@ -1,7 +1,5 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     ['artisan [command...]', 'art'],
     'run artisan command',
@@ -11,5 +9,5 @@ module.exports = [
                 default: ''
             });
     },
-    argv => _.up(() => execSync(`${_.docker} ${_.exec} php bash -lc "php artisan ${argv.command.join(' ')}"`, _.opts))
+    argv => _.up(() => _.command("php", `php artisan ${argv.command.join(' ')}`))
 ];

package/commands/check.js

@@ -1,7 +1,5 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     'check',
     'check if node modules are missing or outdated',
@@ -13,10 +11,10 @@ module.exports = [
             });
     },
     argv => {
-        execSync(`${_.docker} ${_.run} -c "check-dependencies ${argv.v ? '' : '&>/dev/null'} && echo -e '\\033[0;32mNpm deps OK\\033[0m' || { echo -e '\\033[0;31mNpm deps missing or outdated\\033[0m'; } && are-you-es5 check . && echo -e '\\033[0;32mNpm-ES5 compatibility OK\\033[0m' || { echo -e '\\033[0;31mNpm-ES5 incompatibilities detected\\033[0m'; }"`, _.opts);
+        _.command("core", `check-dependencies ${argv.v ? '' : '&>/dev/null'} && echo -e '\\033[0;32mNpm deps OK\\033[0m' || { echo -e '\\033[0;31mNpm deps missing or outdated\\033[0m'; } && are-you-es5 check . && echo -e '\\033[0;32mNpm-ES5 compatibility OK\\033[0m' || { echo -e '\\033[0;31mNpm-ES5 incompatibilities detected\\033[0m'; }`);
 
         if(_.platform === "laravel" || _.platform === "drupal" || _.platform === "craftcms"){
-            execSync(`${_.docker} ${_.method} php bash -lc "composer install --dry-run ${argv.v ? '' : '2>&1'} | grep -q 'Nothing to install, update or remove' && echo -e '\\033[0;32mComposer deps OK\\033[0m' || echo -e '\\033[0;31mComposer deps missing or outdated\\033[0m'"`, _.opts);
+            _.command("php", `${argv.v ? `composer install --dry-run 2>&1 | grep '\\- Installing' | while read -r line; do echo \\$\{line/'Installing'\}; done && ` : ''}composer install --dry-run 2>&1 | grep -q 'Nothing to install, update or remove' && echo -e '\\033[0;32mComposer deps OK\\033[0m' || echo -e '\\033[0;31mComposer deps missing or outdated\\033[0m'`);
         }
     }
 ];

package/commands/clean.js

@@ -1,16 +1,14 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     'clean',
     'cleans out dependencies',
     yargs => {},
     argv => {
-        execSync(`${_.docker} ${_.run} -c "git clean -xfd node_modules/ 2>/dev/null || true"`, _.opts);
+        _.command("core", `git clean -xfd node_modules/ 2>/dev/null || true`);
 
         if(_.platform === "laravel" || _.platform === "drupal" || _.platform === "craftcms"){
-            execSync(`${_.docker} ${_.method} php bash -lc "git clean -xfd vendor/ 2>/dev/null || true"`, _.opts);
+            _.command("php", `git clean -xfd vendor/ 2>/dev/null || true`);
         }
     }
 ];

package/commands/composer.js

@@ -1,7 +1,5 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     'composer [command...]',
     'run composer command',
@@ -11,5 +9,5 @@ module.exports = [
                 default: ''
             });
     },
-    argv => execSync(`${_.docker} ${_.method} php bash -lc "composer ${argv.command.join(' ')}"`, _.opts)
+    argv => _.command("php", `composer ${argv.command.join(' ')}`)
 ];

package/commands/connect.js

@@ -1,7 +1,5 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     'connect [container]',
     'jump into container',
@@ -11,18 +9,5 @@ module.exports = [
                 default: 'core'
             });
     },
-    argv => {
-        let run = ' -l';
-        let user = '';
-        // Don't login on core@1 so /etc/profile isn't loaded and $PATH reset (likely don't need to login on anything other than core@0 but need test suite to check)
-        if(argv.container === "core" && process.env.VERSION === "1"){
-            run = '';
-            
-            if(_.running){
-                user = ' -u node';
-            }
-        }
-
-        execSync(`${_.docker} ${_.method}${user} ${argv.container} bash${run}`, _.opts);
-    }
+    argv => _.command(argv.container)
 ];

package/commands/content.js

@@ -1,10 +1,8 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     'content', 
     'pulls any external content and assets into the repo', 
     yargs => {}, 
-    argv => execSync(`${_.docker} ${_.run} -c "npm run content"`, _.opts)
+    argv => _.command("core", `npm run content`)
 ];

package/commands/craft.js

@@ -1,7 +1,5 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     ['craft [command...]', 'craft'],
     'run craft command',
@@ -11,5 +9,5 @@ module.exports = [
                 default: ''
             });
     },
-    argv => _.up(() => execSync(`${_.docker} ${_.exec} php bash -lc "php craft ${argv.command.join(' ')}"`, _.opts))
+    argv => _.up(() => _.command("php", `php craft ${argv.command.join(' ')}`))
 ];

package/commands/deploy.js

@@ -10,7 +10,7 @@ module.exports = [
         if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal" || _.platform === "craftcms"){
             _.up(() => execSync(`source ${__dirname}/../intercept.sh && /bin/bash ./_Scripts/deploy.sh`, _.opts));
         } else {
-            execSync(`${_.docker} ${_.run} -c "${(process.env.VERSION === "0") ? 'xvfb-run ' : ''}npm run deploy"`, _.opts);
+            _.command("core", `${(process.env.VERSION === "0") ? 'xvfb-run ' : ''}npm run deploy`);
         }
     }
 ];

package/commands/docker/mocha.js

@@ -6,5 +6,5 @@ module.exports = [
     'mocha',
     false,
     yargs => {},
-    argv => execSync(`${_.docker} ${_.run} -c "${(process.env.VERSION === "0") ? 'xvfb-run ' : ''}npm run mocha"`, _.opts)
+    argv => _.command("core", `${(process.env.VERSION === "0") ? 'xvfb-run ' : ''}npm run mocha`, true)
 ];

package/commands/drush.js

@@ -1,7 +1,5 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     'drush [command...]',
     'run drush command',
@@ -11,5 +9,5 @@ module.exports = [
                 default: ''
             });
     },
-    argv => _.up(() => execSync(`${_.docker} ${_.exec} php bash -lc "vendor/bin/drush ${argv.command.join(' ')}"`, _.opts))
+    argv => _.up(() => _.command("php", `vendor/bin/drush ${argv.command.join(' ')}`))
 ];

package/commands/execute.js

@@ -1,7 +1,5 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     ['execute [command...]', 'exec'],
     'run a custom command in the container',
@@ -24,9 +22,16 @@ module.exports = [
                 describe: 'Execute a grunt command',
                 type: 'boolean'
             });
+
+        yargs.option('container', {
+                alias: 'c',
+                describe: 'container to connect to',
+                default: 'core'
+            });
     },
     argv => {
         const prep = argv.g ? 'npx grunt --gruntfile node_modules/@fishawack/core/Gruntfile.js ' : ' ';
-        execSync(`${_.docker} ${_.run} -c "${argv.d ? 'xvfb-run ' : ''}${prep}${argv.command.join(prep)}"`, _.opts)
+        
+        _.command(argv.container, `${argv.d ? 'xvfb-run ' : ''}${prep}${argv.command.join(' ')}`);
     }
 ];

package/commands/install.js

@@ -1,7 +1,5 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     ['install [package...]', 'i'],
     'runs npm install or installs a package/packages',
@@ -11,5 +9,5 @@ module.exports = [
                 default: ''
             });
     },
-    argv => execSync(`${_.docker} ${_.run} -c "npm install ${argv.package.join(' ')}"`, _.opts)
+    argv => _.command("core", `npm install ${argv.package.join(' ')}`)
 ];

package/commands/npm.js

@@ -1,7 +1,5 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     'npm [command...]',
     'run npm command',
@@ -11,5 +9,5 @@ module.exports = [
                 default: ''
             });
     },
-    argv => execSync(`${_.docker} ${_.run} -c "npm ${argv.command.join(' ')}"`, _.opts)
+    argv => _.command("core", `npm ${argv.command.join(' ')}`)
 ];

package/commands/php.js

@@ -1,7 +1,5 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     'php [command...]',
     'run php command',
@@ -11,5 +9,5 @@ module.exports = [
                 default: ''
             });
     },
-    argv => execSync(`${_.docker} ${_.method} php bash -lc "php ${argv.command.join(' ')}"`, _.opts)
+    argv => _.command("php", `php ${argv.command.join(' ')}`)
 ];

package/commands/production.js

@@ -1,10 +1,8 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     ['production', 'prod'],
     'builds for production',
     yargs => {},
-    argv => execSync(`${_.docker} ${_.run} -c "${(process.env.VERSION === "0") ? 'xvfb-run ' : ''}npm run production"`, _.opts)
+    argv => _.command("core", `${(process.env.VERSION === "0") ? 'xvfb-run ' : ''}npm run production`)
 ];

package/commands/regenerate.js

@@ -1,16 +1,14 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     ['regenerate', 'regen'],
     'regenerates dependency lock files',
     yargs => {},
     argv => {
-        execSync(`${_.docker} ${_.run} -c "rm package-lock.json; git clean -xfd node_modules/ 2>/dev/null || true; npm install"`, _.opts);
+        _.command("core", `rm package-lock.json; git clean -xfd node_modules/ 2>/dev/null || true; npm install`);
 
         if(_.platform === "laravel" || _.platform === "drupal" || _.platform === "craftcms"){
-            execSync(`${_.docker} ${_.method} php bash -lc "rm composer.lock; git clean -xfd vendor/ 2>/dev/null || true; composer install"`, _.opts)
+            _.command("php", `rm composer.lock; git clean -xfd vendor/ 2>/dev/null || true; composer install`);
         }
     }
 ];

package/commands/reinstall.js

@@ -1,16 +1,14 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     ['reinstall', 'ci'],
     'installs fresh dependencies',
     yargs => {},
     argv => {
-        execSync(`${_.docker} ${_.run} -c "npm ci || npm i"`, _.opts);
+        _.command("core", `npm ci || npm i`);
         
         if(_.platform === "laravel" || _.platform === "drupal" || _.platform === "craftcms"){
-            execSync(`${_.docker} ${_.method} php bash -lc "composer install"`, _.opts);
+            _.command("php", `composer install`);
         }
     }
 ];

package/commands/run.js

@@ -1,7 +1,5 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     'run [command] [flags...]',
     'run an npm script',
@@ -24,5 +22,5 @@ module.exports = [
             });
         }
     },
-    argv => execSync(`${_.docker} ${_.run} -c "${argv.d ? 'xvfb-run ' : ''}npm run ${argv.command} -- -- ${argv.flags.join(' ')}"`, _.opts)
+    argv => _.command("core", `${argv.d ? 'xvfb-run ' : ''}npm run ${argv.command} -- -- ${argv.flags.join(' ')}`)
 ];

package/commands/setup.js

@@ -10,7 +10,7 @@ module.exports = [
         if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal" || _.platform === "craftcms"){
             _.up(() => execSync(`source ${__dirname}/../intercept.sh && /bin/bash ./_Scripts/setup.sh`, _.opts));
         } else {
-            execSync(`${_.docker} ${_.run} -c "npm run setup"`, _.opts);
+            _.command("core", `npm run setup`);
         }
     }
 ];

package/commands/start.js

@@ -1,7 +1,5 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     'start [flags...]',
     'build -> watch',
@@ -13,21 +11,13 @@ module.exports = [
     },
     argv => {
         _.ports.get();
+
+        const command = () => _.command("core", `npm start -- -- ${argv.flags.join(' ')}`, true);
         
         if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal" || _.platform === "craftcms"){
-            _.up(() => {
-                let run = ' -l';
-                let user = '';
-                // Don't login on core@1 so /etc/profile isn't loaded and $PATH reset (likely don't need to login on anything other than core@0 but need test suite to check)
-                if(process.env.VERSION === "1"){
-                    run = '';
-                    user = ' -u node';
-                }
-                
-                execSync(`${_.docker} ${_.exec}${user} core bash${run} -c "npm start -- -- ${argv.flags.join(' ')}" 2>/dev/null`, _.opts);
-            });
+            _.up(command);
         } else {
-            execSync(`${_.docker} ${_.run} -c "npm start -- -- ${argv.flags.join(' ')}" 2>/dev/null`, _.opts);
+            command();
         }
     }
 ];

package/commands/test.js

@@ -1,25 +1,15 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     'test',
     'run tests',
     yargs => {},
     argv => {
         _.up(() => {
-            let run = ' -l';
-            let user = '';
-            // Don't login on core@1 so /etc/profile isn't loaded and $PATH reset (likely don't need to login on anything other than core@0 but need test suite to check)
-            if(process.env.VERSION === "1"){
-                run = '';
-                user = ' -u node';
-            }
-            
-            execSync(`${_.docker} ${_.exec}${user} core bash${run} -c "${(process.env.VERSION === "0") ? 'xvfb-run ' : ''}npm run test"`, _.opts);
+            _.command("core", `${(process.env.VERSION === "0") ? 'xvfb-run ' : ''}npm run test`);
 
             if(_.platform === "laravel"){
-                execSync(`${_.docker} ${_.exec} php bash -lc "php artisan test"`, _.opts);
+                _.command("php", `php artisan test`);
             }
         });
     }

package/commands/uninstall.js

@@ -1,7 +1,5 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     ['uninstall [package...]'],
     'runs npm uninstall on a package/packages',
@@ -11,5 +9,5 @@ module.exports = [
                 default: ''
             });
     },
-    argv => execSync(`${_.docker} ${_.run} -c "npm uninstall ${argv.package.join(' ')}"`, _.opts)
+    argv => _.command("core", `npm uninstall ${argv.package.join(' ')}`)
 ];

package/commands/watch.js

@@ -1,7 +1,5 @@
 const _ = require('../globals.js');
 
-const execSync = require('child_process').execSync;
-
 module.exports = [
     'watch',
     'watch', 
@@ -14,7 +12,15 @@ module.exports = [
         ){
             console.log("Watch command not supported in this project");
         } else {
-            execSync(`${_.docker} ${_.run} -c "$grunt browserSync watch" 2>/dev/null`, _.opts)
+            const prep = 'npx grunt --gruntfile node_modules/@fishawack/core/Gruntfile.js ';
+
+            const command = () => _.command("core", `${prep}browserSync watch`, true);
+            
+            if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal" || _.platform === "craftcms"){
+                _.up(command);
+            } else {
+                command();
+            }
         }
     }
 ];

package/commands/wp.js

@@ -11,5 +11,5 @@ module.exports = [
                 default: ''
             });
     },
-    argv => _.up(() => execSync(`${_.docker} ${_.exec} wordpress bash -lc "wp ${argv.command.join(' ')} --allow-root"`, _.opts))
+    argv => _.up(() => _.command("wordpress", `wp ${argv.command.join(' ')} --allow-root`))
 ];

package/core/0/docker-compose.yml

@@ -2,6 +2,8 @@ version: "3.8"
 services:
   core:
     platform: linux/amd64
+    build: 
+      context: $DIRNAME/core/0/
     image: fishawack/core:${FW_CORE_0_VERSION:-latest}
     init: true
     tty: true

package/core/1/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### 1.3.0 (2023-03-17)
+* [feat] node user is now added to www-data group for easier file permission management
+* [fix] disable npm message about update being available
+
 ### 1.2.2 (2023-02-25)
 * [fix] set BRANCH and CI_COMMIT_REF_NAME env variables in container
 * [fix] installed git-branch to fetch the current branch for deployment targets

package/core/1/Dockerfile

@@ -28,6 +28,12 @@ RUN rm -rf /sass.tar.gz
 # Set safe directory to remove intel errors when running git rev-parse
 RUN su node -c "git config --global --add safe.directory /app"
 
+# Disable npm message about updates being available
+RUN su node -c "npm config set update-notifier false"
+
+# Add node user to www-data group
+RUN usermod -a -G www-data node
+
 # Install lftp
 RUN apt-get install -y lftp
 

package/core/1/docker-compose.yml

@@ -1,6 +1,9 @@
 version: "3.8"
 services:
   core:
+    build: 
+      context: $DIRNAME/core/1/
+      target: ${FW_CORE_1_TARGET:-alpine}
     image: ${FW_CORE_1_IMAGE:-fishawack/lab-env-core-1-alpine}:${FW_CORE_1_VERSION:-latest}
     init: true
     tty: true

package/core/1/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "lab-env docker config for the @fishawack/core/1 npm module",
   "scripts": {
     "preversion": "docker login",

package/craftcms/3/apache/CHANGELOG.md

@@ -0,0 +1,4 @@
+## Changelog
+
+### 1.0.0 (2023-03-23)
+* [Misc] initial commit

package/craftcms/3/apache/Dockerfile

@@ -0,0 +1,11 @@
+FROM httpd:2.4.54 AS development
+
+MAINTAINER Mike Mellor
+
+# Copy nginx conf
+COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf
+
+FROM fishawack/lab-env-craftcms-3-apache:latest AS production
+
+# Copy source code into container
+COPY . /app