@fishawack/lab-env 4.9.0 → 4.10.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## Changelog
 
+### 4.10.0 (2023-02-21)
+* [Feature] Created core@1 image for @fishawack/core projects >= 8
+* [Feature] New env variables for changing lab-env behaviour, FW_DEV, FW_NEXT, FW_FULL, FW_ROOT
+* [Feature] lab-env now has a latest known version of the core that if a project exceeds will cause an error
+* [Feature] New diagnose prompt for egnyte credentials in new location
+* [Change] Nuke no longer internally calls volumes command but pulls them from globals as an export
+* [Change] --display flag only available on core@0
+* [Change] Bumped core `0.2.0` to `0.2.1`
+* [Change] Core images now lock version into image with environment variables
+* [Change] Bumped diagnose version
+* [Change] Build commands now use --ssh flag to mount live agent
+* [Bug] Put fix in core@0 for sed issue on new Virtio file mounting mode that was modifying package.json file permissions or creating a temp file
+
 ### 4.9.0 (2023-01-26)
 * [Feature] Added newly setup AWS accounts to the client prompts on `fw provision`
 

package/_Test/check.js

@@ -7,22 +7,44 @@ const expect = require('chai').expect;
 const execSync = require('child_process').execSync;
 
 describe('check', () => {
+    let output;
+
     before(function(){
-        execSync(`mkdir _Test/_fixtures/${repo} && cd _Test/_fixtures/${repo} && npm init -y`, {encoding: 'utf8', stdio: 'inherit'});
+        execSync(`mkdir _Test/_fixtures/${repo} && cd _Test/_fixtures/${repo} && npm init -y &>/dev/null && git init &>/dev/null`, {encoding: 'utf8', stdio: 'inherit'});
+
+        execSync('node ../../../cli.js install lodash@4.17.15 query-string@7.1.1 --force && git add . && git commit -m "feat: initial commit"', opts);
 
-        execSync('node ../../../cli.js install lodash@4.17.15 query-string@7.1.1', opts);
+        output = execSync('node ../../../cli.js check --force', {cwd: `_Test/_fixtures/${repo}`}).toString();
     });
     
-    it(`Should flag query-string as non es5 dependency`, () => {
-        expect(execSync('node ../../../cli.js check', {cwd: `_Test/_fixtures/${repo}`}).toString()).to.contain('query-string');
+    describe('are-you-es5', () => {
+        it(`Should flag non es5 dependencies`, () => {
+            expect(output).to.contain('Npm-ES5 incompatibilities detected');
+        });
+        
+        it(`Should flag query-string as non es5 dependency`, () => {
+            expect(output).to.contain('query-string');
+        });
+    
+        it(`Should not flag lodash as es5 dependency`, () => {
+            expect(output).to.not.contain('lodash');
+        });
     });
 
-    it(`Should not flag lodash as es5 dependency`, () => {
-        expect(execSync('node ../../../cli.js check', {cwd: `_Test/_fixtures/${repo}`}).toString()).to.not.contain('lodash');
+    describe('check-dependencies', () => {
+        it(`Should flag no missing dependencies`, () => {
+            expect(output).to.contain('Npm deps OK');
+        });
+
+        it(`Should flag missing dependencies`, () => {
+            execSync('node ../../../cli.js nuke --force', opts);
+            
+            expect(execSync('node ../../../cli.js check --force', {cwd: `_Test/_fixtures/${repo}`}).toString()).to.contain('Npm deps missing or outdated');
+        });
     });
 
     after(() => {
-        execSync('node ../../../cli.js nuke', opts)
+        execSync('node ../../../cli.js nuke --force', opts);
 
         execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
     });

package/cli.js

@@ -14,7 +14,7 @@ const args = hideBin(process.argv);
 (async () => {
     const updateNotifier = (await import('update-notifier')).default;
     const pkg = require('./package.json');
-    updateNotifier({pkg, updateCheckInterval: 0}).notify();
+    updateNotifier({pkg, updateCheckInterval: 0}).notify({isGlobal: true});
 
     process.env.REPO = _.repo;
     
@@ -29,6 +29,10 @@ const args = hideBin(process.argv);
             .option('debug', {
                 global: true,
                 description: `Show extra information to help debug issues`
+            })
+            .option('force', {
+                global: true,
+                description: `Continue past standard failure points (use at your own risk)`
             });
         
         // Repo commands

package/commands/create/libs/vars.js

@@ -28,6 +28,17 @@ try{
 // ftppass
 module.exports.ftppass = ftppassFile;
 
+var creds = {};
+
+try{
+    creds.egnyte = JSON.parse(fs.readFileSync(path.join(os.homedir(), 'targets', 'ftp-fishawack.egnyte.com.json'), { encoding: 'utf8' }));
+} catch(e){
+    creds.egnyte = {};
+}
+
+// Credentials
+module.exports.creds = creds;
+
 // APIs
 const bitbucketApi = module.exports.bitbucketApi = 'https://api.bitbucket.org/2.0/repositories';
 

package/commands/create/services/egnyte.js

@@ -1,14 +1,24 @@
-const api = require('./api');
 const { Spinner } = require('../libs/utilities');
-const { ftppass } = require('../libs/vars');
+const { ftppass, creds } = require('../libs/vars');
 const { exec } = require("child_process");
 
 module.exports.check = async () => {
+    try {
+        await module.exports.request(creds.egnyte.username, creds.egnyte.password, creds.egnyte.host);
+        await module.exports.request(ftppass['ftp-fishawack.egnyte.com'].username, ftppass['ftp-fishawack.egnyte.com'].password, 'ftp-fishawack.egnyte.com');
+        
+        return true;
+    } catch(error) {
+        return false;
+    }
+};
+
+module.exports.request = async (username, password, host) => {
     let spinner = new Spinner(`Communicating with Egnyte`);
 
     try {        
         if (!await new Promise((resolve, reject) => {
-            exec(`curl -I -k --ftp-ssl --ftp-pasv -u "${ftppass['ftp-fishawack.egnyte.com'].username.replace('$', '\\$')}:${ftppass['ftp-fishawack.egnyte.com'].password}" ftp://ftp-fishawack.egnyte.com`, (error, stdout, stderr) => {
+            exec(`curl -I -k --ftp-ssl --ftp-pasv -u "${username.replace('$', '\\$')}:${password}" ftp://${host}`, (error, stdout, stderr) => {
                 if(error){
                     reject(error);
                     return;

package/commands/create/services/guide.js

@@ -2,7 +2,7 @@ const inquirer = require('inquirer');
 const { homedir } = require('os');
 const { mkdirSync, writeFileSync, readFileSync } = require("fs");
 const { encode } = require('../libs/utilities');
-const { urls, apis, misc: creds, bitbucketApi, headers, ftppass: creds_ftppass } = require('../libs/vars');
+const { urls, apis, misc: creds_misc, bitbucketApi, headers, ftppass: creds_ftppass, creds } = require('../libs/vars');
 const { execSync } = require('child_process');
 
 module.exports.targets = async () => {
@@ -55,13 +55,13 @@ module.exports.bitbucket = async () => {
                 type: 'input',
                 name: 'username',
                 message: 'What is your bitbucket username? (e.g. mmellor)',
-                default: creds.bitbucket && creds.bitbucket.username,
+                default: creds_misc.bitbucket && creds_misc.bitbucket.username,
                 validate: input => input.trim().length > 0 || 'Username cannot be an empty string'
             },
             {
                 type: 'password',
                 name: 'password',
-                default: creds.bitbucket && creds.bitbucket.password,
+                default: creds_misc.bitbucket && creds_misc.bitbucket.password,
                 message: 'What is your bitbucket password? (e.g. password1234)',
                 validate: input => input.trim().length > 0 || 'Password cannot be an empty string'
             },
@@ -75,7 +75,7 @@ module.exports.bitbucket = async () => {
 
         let file = JSON.parse(readFileSync(`${homedir()}/targets/misc.json`, { encoding: 'utf8' }));
 
-        creds.bitbucket = file.bitbucket = {...inputs};
+        creds_misc.bitbucket = file.bitbucket = {...inputs};
         apis.bbWorkspaceAPI = `${bitbucketApi}/${inputs.workspace}`;
         headers.bbHeaders = encode(inputs.username, inputs.password);
         urls.bitbucketSSH = `git@bitbucket.org:${inputs.workspace}`;
@@ -102,7 +102,7 @@ module.exports.gitlab = async () => {
                 type: 'password',
                 name: 'token',
                 message: 'What is your gitlab token? (e.g. puhQmpZGooQyLCa5LhTg)',
-                default: creds.gitlab && creds.gitlab.token || null,
+                default: creds_misc.gitlab && creds_misc.gitlab.token || null,
                 validate: input => input.trim().length > 0 || 'Password cannot be an empty string'
             },
             {
@@ -115,7 +115,7 @@ module.exports.gitlab = async () => {
 
         let file = JSON.parse(readFileSync(`${homedir()}/targets/misc.json`, { encoding: 'utf8' }));
 
-        creds.gitlab = file.gitlab = {...inputs};
+        creds_misc.gitlab = file.gitlab = {...inputs};
     
         writeFileSync(`${homedir()}/targets/misc.json`, JSON.stringify(file, null, 4));
     } else {
@@ -165,14 +165,22 @@ module.exports.egnyte = async () => {
                 message: 'What is your egnyte password? (e.g. password1234)',
                 default: creds_ftppass['ftp-fishawack.egnyte.com'] && creds_ftppass['ftp-fishawack.egnyte.com'].password || null,
                 validate: input => input.trim().length > 0 || 'Password cannot be an empty string'
+            },
+            {
+                type: 'host',
+                name: 'host',
+                message: 'What is your egnyte host? (e.g. ftp-fishawack.egnyte.com)',
+                default: creds.egnyte && creds.egnyte.host || "ftp-fishawack.egnyte.com",
+                validate: input => input.trim().length > 0 || 'Host cannot be an empty string'
             }
         ]);
 
         let file = JSON.parse(readFileSync(`${homedir()}/targets/.ftppass`, { encoding: 'utf8' }));
 
-        creds_ftppass['ftp-fishawack.egnyte.com'] = file['ftp-fishawack.egnyte.com'] = {...inputs};
+        creds.egnyte = creds_ftppass['ftp-fishawack.egnyte.com'] = file['ftp-fishawack.egnyte.com'] = {...inputs};
     
         writeFileSync(`${homedir()}/targets/.ftppass`, JSON.stringify(file, null, 4));
+        writeFileSync(`${homedir()}/targets/${creds.egnyte.host}.json`, JSON.stringify({...creds.egnyte, passphrase: ''}, null, 4));
     } else {
         throw('');
     }

package/commands/create/services/test.js

@@ -70,11 +70,19 @@ module.exports.egnyte = async () => {
     // Check .ftppass has Egnyte credentials
     let spinner = new utils.Spinner('Looking for Egnyte credentials');
 
-    if (vars.ftppass['ftp-fishawack.egnyte.com'] && vars.ftppass['ftp-fishawack.egnyte.com'].username && vars.ftppass['ftp-fishawack.egnyte.com'].password) {
+    if (
+        vars.ftppass['ftp-fishawack.egnyte.com'] && 
+        vars.ftppass['ftp-fishawack.egnyte.com'].username && 
+        vars.ftppass['ftp-fishawack.egnyte.com'].password && 
+        vars.creds.egnyte && 
+        vars.creds.egnyte.username && 
+        vars.creds.egnyte.password &&
+        vars.creds.egnyte.host
+    ) {
         spinner.update('Found Egnyte credentials  in \'.ftppass\'');
         return true;
     } else {
-        spinner.update('Couldn\'t find Egnyte credentials in \'.ftppass\'', 'fail');
+        spinner.update('Couldn\'t find Egnyte credentials either in \'ftp-fishawack.egnyte.com.json\' or \'.ftppass\' (legacy location)', 'fail');
     }
 }
 

package/commands/docker/build.js

@@ -11,5 +11,5 @@ module.exports = [
                 default: ''
             });
     },
-    argv => execSync(`${_.docker} build ${argv.image}`, _.opts)
+    argv => execSync(`${_.docker} build --ssh default ${argv.image}`, _.opts)
 ];

package/commands/docker/volumes.js

@@ -5,34 +5,6 @@ module.exports = [
     false,
     yargs => {},
     argv => {
-        let volumes = [
-            'node_modules'
-        ];
-
-        if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal" || _.platform === "craftcms"){
-            volumes.push(
-                'mysql'
-            );
-        }
-
-        if(_.platform === "drupal"){
-            volumes.push(
-                'drupal'
-            );
-        }
-        
-        if(_.platform === "laravel"){
-            volumes.push(
-                'redis'
-            );
-        }
-
-        if(_.platform === "laravel" || _.platform === "drupal" ||  _.platform === "craftcms"){
-            volumes.push(
-                'vendor'
-            );
-        }
-
-        console.log(`${volumes.map(d => `${_.repo_safe}_${d}`).join('\n')}`);
+        console.log(`${_.volumes.join('\n')}`);
     }
 ];

package/commands/execute.js

@@ -11,11 +11,13 @@ module.exports = [
                 default: 'ls'
             });
 
-        yargs.option('display', {
-                alias: 'd',
-                describe: 'Run with a virtual display',
-                type: 'boolean'
-            });
+        if(process.env.VERSION === "0"){            
+            yargs.option('display', {
+                    alias: 'd',
+                    describe: 'Run with a virtual display',
+                    type: 'boolean'
+                });
+        }
 
         yargs.option('grunt', {
                 alias: 'g',

package/commands/nuke.js

@@ -11,7 +11,7 @@ module.exports = [
 
         // Remove all virtual volumes
         try{
-            execSync(`lab-env volumes | xargs docker volume rm $@`, _.opts);
+            execSync(`docker volume rm ${_.volumes.join(' ')}`, _.opts);
         } catch(e){}
     }
 ];

package/commands/run.js

@@ -15,11 +15,14 @@ module.exports = [
                 describe: 'flags to pass',
                 default: ''
             });
-        yargs.option('display', {
+
+        if(process.env.VERSION === "0"){
+            yargs.option('display', {
                 alias: 'd',
                 describe: 'Run with a virtual display',
                 type: 'boolean'
             });
+        }
     },
     argv => execSync(`${_.docker} ${_.run}c "${argv.d ? 'xvfb-run ' : ''}npm run ${argv.command} -- -- ${argv.flags.join(' ')}"`, _.opts)
 ];

package/core/{CHANGELOG.md → 0/CHANGELOG.md}

@@ -1,5 +1,8 @@
 ## Changelog
 
+### 0.2.1 (2023-02-21)
+* [Fix] Fixed bug in sed command on new Virtio file mounting system that caused modification of package.json file permissions or created a temporary file
+
 ### 0.2.0 (2022-09-08)
 * [Feature] are-you-es5 dependency now globally installed with npm
 * [Fix] core now points to google-chrome 105 now that 87 is no longer available to download through the image

package/core/{0.2.0 → 0}/Dockerfile

@@ -181,7 +181,7 @@ npm(){(\n\
         sed -i \'s/--parallel=10/--parallel=1/g\' $PWD/node_modules/@fishawack/config-grunt/_Tasks/options/shell.js 2>/dev/null || true\n\
         sed -i \'s/--parallel=10/--parallel=1/g\' $PWD/node_modules/@fishawack/core/_Tasks/options/shell.js 2>/dev/null || true\n\
         echo "Replacing any npm variables with the full values"\n\
-        sed -i \'s/$npm_package_vars_config/--prefix node_modules\/@fishawack\/config-grunt\//g\' package.json 2>/dev/null || true\n\
+        perl -pi -e \'s/\$npm_package_vars_config/--prefix node_modules\/\@fishawack\/config-grunt\//g\' package.json 2>/dev/null || true\n\
         echo "Replace line in ftpscript that toggles passive which these days toggles it to off mode which breaks the docker setup"\n\
         sed -i "s/cmds.push \'passive\' if opts.passive/\#remove passive line/g" $PWD/node_modules/grunt-ftpscript/tasks/ftpscript.coffee 2>/dev/null || true\n\
         echo "Add line to browser-sync to enable polling as file events not fired on windows docker projects"\n\

package/core/0/docker-compose-dev.yml

@@ -0,0 +1,5 @@
+version: "3.8"
+services:
+  core:
+    build: 
+      context: ./

package/core/{docker-compose.yml → 0/docker-compose.yml}

@@ -2,7 +2,7 @@ version: "3.8"
 services:
   core:
     platform: linux/amd64
-    image: fishawack/core:${VERSION:-1.0.0}
+    image: fishawack/core:${FW_CORE_0_VERSION:-latest}
     init: true
     tty: true
     volumes:

package/core/0/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "core",
+  "version": "0.2.1",
+  "description": "lab-env docker config for the @fishawack/core npm module",
+  "scripts": {
+    "preversion": "docker login",
+    "postversion": "docker build --platform linux/amd64 -t fishawack/core:$npm_package_version -t fishawack/core:latest . && docker push fishawack/core:$npm_package_version && docker push fishawack/core:latest && git add . && git commit -m \"build: Bumped core to $npm_package_version\""
+  },
+  "author": "Mike Mellor",
+  "license": "ISC"
+}

package/core/1/CHANGELOG.md

@@ -0,0 +1,23 @@
+## Changelog
+
+### 1.1.4 (2023-02-23)
+* [Fix] Installed missing are-you-es5 global npm module
+* [Fix] Installed missing check-dependencies global npm module
+
+### 1.1.3 (2023-02-23)
+* [Fix] Switch to ENV for $PATH updates to avoid shell profile loading issues
+* [Fix] Moved chromium to alpine image as its needed for svg tasks and testing
+
+### 1.1.2 (2023-02-22)
+* [Fix] cd into $PWD after su command or we'll start in users home directory
+
+### 1.1.1 (2023-02-22)
+* [Fix] Use -l login flag for su command for both non interactive and interactive shells
+* [Fix] Switch $PATH writes to .profile so they are executed on non interactive shells
+
+### 1.1.0 (2023-02-22)
+* [Feature] Watertight now baked into image so not needed in package.json of projects
+* [Fix] lftp installed in alpine image as it's needed for content tasks
+
+### 1.0.0 (2023-02-21)
+* [Misc] initial commit

package/core/1/Dockerfile

@@ -0,0 +1,101 @@
+#####
+# Alpine image
+#####
+
+FROM node:18 AS alpine
+
+MAINTAINER Mike Mellor
+
+ARG TARGETARCH
+
+WORKDIR /app
+
+EXPOSE 3000
+EXPOSE 3001
+
+# Get latest apt-get
+RUN apt-get update
+
+# Update npm to latest
+RUN npm install -g npm@latest
+
+# Install dart sass vm (arch switch)
+RUN curl -L -o /sass.tar.gz https://github.com/sass/dart-sass/releases/download/1.57.1/dart-sass-1.57.1-linux-$(if [ "$TARGETARCH" = "arm64" ]; then echo 'arm64'; else echo 'x64'; fi).tar.gz
+RUN tar -xf /sass.tar.gz -C /
+ENV PATH="${PATH}:/dart-sass/"
+RUN rm -rf /sass.tar.gz
+
+# Set safe directory to remove intel errors when running git rev-parse
+USER node
+RUN git config --global --add safe.directory /app
+USER root
+
+# Install lftp
+RUN apt-get install -y lftp
+
+# Install chromium
+RUN apt-get install -y chromium fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 --no-install-recommends
+# Stop Puppeteer downloading browsers during npm install
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
+ENV PUPPETEER_EXECUTABLE_PATH /usr/bin/chromium
+
+# Install package.json checker
+RUN npm install check-dependencies -g
+
+# Install node_modules checker
+RUN npm install are-you-es5 -g
+
+# Cleanup apt-get install folders
+RUN apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+COPY entrypoint.sh /bin/entrypoint.sh
+RUN chmod +x /bin/entrypoint.sh
+ENTRYPOINT ["/bin/entrypoint.sh"]
+
+#####
+# Full image
+#####
+
+FROM alpine AS full
+
+# Get latest apt-get
+RUN apt-get update
+
+# Install ghostscript
+RUN apt-get install -y ghostscript
+
+# Install zip
+RUN apt-get install zip
+
+# Install AWS Elastic Beanstalk cli
+RUN apt-get install -y zlib1g-dev libssl-dev libncurses-dev libffi-dev libsqlite3-dev libreadline-dev libbz2-dev
+USER node
+RUN git clone https://github.com/aws/aws-elastic-beanstalk-cli-setup.git ~/aws-eb --depth 1 --branch v0.1.2
+RUN ~/aws-eb/scripts/bundled_installer
+RUN rm -rf ~/aws-eb
+ENV PATH="${PATH}:/home/node/.ebcli-virtual-env/executables"
+ENV PATH="${PATH}:/home/node/.pyenv/versions/3.7.2/bin"
+USER root
+
+# Install AWS-CLI@2 (arch switch)
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(if [ "$TARGETARCH" = "arm64" ]; then echo 'aarch64'; else echo 'x86_64'; fi).zip" -o "awscliv2.zip"
+RUN unzip awscliv2.zip
+RUN ./aws/install
+RUN rm -rf ./aws && rm -rf awscliv2.zip
+
+# Update electron globally
+RUN npm install -g electron-packager@latest
+
+# Install wine64
+RUN apt-get install -y wine64
+
+# Install watertight
+RUN --mount=type=ssh npm install -g git+ssh://git@bitbucket.org/fishawackdigital/watertight-node-auto.git#v6.0.0
+
+# Link root global node_modules to ~/.node_modules
+RUN ln -s /usr/local/lib/node_modules/ /home/node/.node_modules
+
+# Cleanup apt-get install folders
+RUN apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

package/core/1/docker-compose-dev.yml

@@ -0,0 +1,5 @@
+version: "3.8"
+services:
+  core:
+    build: 
+      context: ./

package/core/1/docker-compose.yml

@@ -0,0 +1,27 @@
+version: "3.8"
+services:
+  core:
+    image: ${FW_CORE_1_IMAGE:-fishawack/lab-env-core-1-alpine}:${FW_CORE_1_VERSION:-latest}
+    init: true
+    tty: true
+    volumes:
+      - $CWD/:/app
+      - $HOME/targets:/home/node/targets
+      - $HOME/.ssh:/home/node/.ssh
+      - $HOME/.aws:/home/node/.aws
+      - node_modules:/app/node_modules
+    ports:
+      - ${PORT:-3000}:${PORT:-3000}
+      - ${PORT_OPT:-3001}:${PORT_OPT:-3001}
+    environment:
+      - REPO=${REPO:-}
+      - PORT=${PORT:-3000}
+      - PORT_OPT=${PORT_OPT:-3001}
+      - PORT_WEB=${PORT_WEB:-8000}
+      - PORT_DB=${PORT_DB:-3306}
+      - USER_UID=${USER_UID:-0}
+      - USER_GID=${USER_GID:-0}
+      - FW_ROOT=${FW_ROOT:-}
+volumes:
+  node_modules:
+    driver: "local"

package/core/1/entrypoint.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Setting $FW_ROOT will bypass the user switch to node
+if [ -z "$FW_ROOT" ]; then
+    # Set node user id to match host users id so no permission issues outside of docker
+    usermod -u $USER_UID node &>/dev/null
+
+    # Own the node_modules folder otherwise it'll be owned by root/previous node id which will prevent writing
+    chown -R node:node /app/node_modules
+
+    # Default arguments will always be bash -l, if nothing follows this just start an non login interactive shell
+    if [ -z "${@:3}" ]; then
+        exec su node
+    # Otherwise pipe the command after the bash -lc into the non login non interactive shell as a command to exec
+    else
+        exec su node -c "${@:3}"
+    fi
+else
+    echo "Accessing as root"
+    exec "$@"
+fi

package/core/1/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "core",
+  "version": "1.1.4",
+  "description": "lab-env docker config for the @fishawack/core/1 npm module",
+  "scripts": {
+    "preversion": "docker login",
+    "postversion": "docker buildx build --ssh default --platform linux/amd64,linux/arm64 -t fishawack/lab-env-core-1:$npm_package_version -t fishawack/lab-env-core-1:latest --push . && docker buildx build --ssh default --target alpine --platform linux/amd64,linux/arm64 -t fishawack/lab-env-core-1-alpine:$npm_package_version -t fishawack/lab-env-core-1-alpine:latest --push . && git add . && git commit -m \"build: Bumped fishawack/lab-env-core-1 to $npm_package_version\""
+  },
+  "author": "Mike Mellor",
+  "license": "ISC"
+}

package/globals.js

@@ -9,6 +9,8 @@ const { hideBin } = require('yargs/helpers');
 const args = hideBin(process.argv);
 
 process.env.DIRNAME = __dirname;
+process.env.USER_UID=execSync("id -u", {encoding: 'utf8', stdio: 'pipe'}).trim();
+process.env.USER_GID=execSync("id -g", {encoding: 'utf8', stdio: 'pipe'}).trim();
 
 const isDirectory = source => lstatSync(source).isDirectory();
 const getDirectories = source => readdirSync(source).map(name => path.join(source, name)).filter(isDirectory);
@@ -25,7 +27,7 @@ var exec;
 var running;
 var services;
 var branch;
-var diagnosis = '2.0.1';
+var diagnosis = '3.0.0';
 var opts = {encoding: 'utf8', stdio: 'inherit', shell: '/bin/bash'};
 
 try{
@@ -74,24 +76,38 @@ if(composer && composer.require && composer.require['laravel/framework']){
     platform = 'core';
 }
 
-const versions = getDirectories(path.resolve(__dirname, './core')).map(d => path.basename(d)).sort((a, b) => semver.lt(a, b));
-const version = pkg && pkg.devDependencies && (pkg.devDependencies['@fishawack/core'] || pkg.devDependencies['@fishawack/config-grunt']);
+const versions = getDirectories(path.resolve(__dirname, './core')).map(d => path.basename(d)).sort((a, b) => +a - +b);
+const version = pkg && pkg.devDependencies && ((pkg.devDependencies['@fishawack/core'] || pkg.devDependencies['@fishawack/config-grunt']) || pkg.name === '@fishawack/core' && pkg.version);
 
-// if(semver.satisfies(version, '<6')){
-    // process.env.VERSION = '1.0.0';
-// } else {
-    process.env.VERSION = versions[0];
-// }
+if(process.env.FW_NEXT){
+    process.env.VERSION = versions[versions.length - 1];
+} else if(semver.satisfies(version, '<=7.24.0')){
+    process.env.VERSION = '0';
+} else if(semver.satisfies(version, '<=8')) {
+    process.env.VERSION = '1';
+} else {
+    if(!args.find(d => d === '--force')){
+        console.log(`${utilities.colorize(`@fishawack/core`, 'title')} and ${utilities.colorize(`@fishawack/lab-env`, 'title')} have mismatching versions.\n\nRun ${utilities.colorize(`npm i -g @fishawack/lab-env@latest`, 'success')} or pass ${utilities.colorize(`--force`, 'warning')} to continue.`);
+        process.exit(1);
+    }
+    
+    // Default to latest image when outside of known core versions
+    process.env.VERSION = versions[versions.length - 1];
+}
 
-// If dev dep installed, then assume running from npm linked local dev version of lab-env and point to build context rather than docker hub
-let linked = false;
-try { require('mocha'); linked = true; } catch(e) {}
+// Map full image or alpine
+if(process.env.FW_FULL){
+    process.env.FW_CORE_1_IMAGE = "fishawack/lab-env-core-1";
+}
 
-var core = `-f ${__dirname}/core/docker-compose.yml`;
+var core = `-f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml`;
 
-// If locally linked then use locally built compose files to test before publishing onto docker hub
-if(linked){
-    core = `-f ${__dirname}/core/docker-compose-dev.yml ${core}`;
+if(process.env.FW_DEV){
+    core = `-f ${__dirname}/core/${process.env.VERSION}/docker-compose-dev.yml ${core}`;
+} else {
+    // Map versions of images (dont set on FW_DEV as we want to default to latest)
+    process.env.FW_CORE_0_VERSION = process.env.FW_CORE_0_VERSION || require('./core/0/package.json').version;
+    process.env.FW_CORE_1_VERSION = process.env.FW_CORE_1_VERSION || require('./core/1/package.json').version;
 }
 
 if(platform === 'laravel'){
@@ -101,8 +117,7 @@ if(platform === 'laravel'){
 
     let container = `-f ${__dirname}/laravel/8/docker-compose.yml`;
 
-    // If linked locally then use locally built php image
-    if(linked){
+    if(process.env.FW_DEV){
         container = `-f ${__dirname}/laravel/8/docker-compose-dev.yml ${container}`;
     }
 
@@ -120,8 +135,7 @@ if(platform === 'laravel'){
 
     let container = `-f ${__dirname}/drupal/9/docker-compose.yml`;
 
-    // If linked locally then use locally built php image
-    if(linked){
+    if(process.env.FW_DEV){
         container = `-f ${__dirname}/drupal/9/docker-compose-dev.yml ${container}`;
     }
     
@@ -164,11 +178,40 @@ if(args[0] !== 'diag' && args[0] !== 'diagnose' && args[0] !== 'origin' && args[
     }
 }
 
+let volumes = [
+    'node_modules'
+];
+
+if(platform === "laravel" || platform === "wordpress" || platform === "drupal" || platform === "craftcms"){
+    volumes.push(
+        'mysql'
+    );
+}
+
+if(platform === "drupal"){
+    volumes.push(
+        'drupal'
+    );
+}
+
+if(platform === "laravel"){
+    volumes.push(
+        'redis'
+    );
+}
+
+if(platform === "laravel" || platform === "drupal" ||  platform === "craftcms"){
+    volumes.push(
+        'vendor'
+    );
+}
+
 module.exports = {
     config,
     diagnosis,
     services,
     platform,
+    volumes: volumes.map(d => `${repo_safe}_${d}`),
     repo,
     branch,
     repo_safe,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "4.9.0",
+  "version": "4.10.0",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {

package/core/docker-compose-dev.yml

@@ -1,5 +0,0 @@
-version: "3.8"
-services:
-  core:
-    build: 
-      context: $DIRNAME/core/${VERSION:-1.0.0}/

package/core/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "core",
-  "version": "0.2.0",
-  "description": "lab-env docker config for the @fishawack/core npm module",
-  "scripts": {
-    "preversion": "docker login",
-    "postversion": "mv ./*/ ./$npm_package_version && docker build ./*/ -t fishawack/core:$npm_package_version --platform linux/amd64 -t fishawack/core:latest && docker push fishawack/core:$npm_package_version && docker push fishawack/core:latest && git add . && git commit -m \"build: Bumped core to $npm_package_version\""
-  },
-  "author": "Mike Mellor",
-  "license": "ISC"
-}