@fishawack/lab-env 1.12.0 → 1.15.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## Changelog
 
+### 1.15.0 (2022-01-17)
+* [Feature] Docker images are now pulled from docker hub if lab-env not running with devDependencies installed
+* [Feature] Added a package.json to the core package in lab-env for more streamlined docker hub publishes
+* [Change] Core image path now defined by new $DIRNAME variable
+* [Change] Ignore fixtures in tests folder as they're cloned repos
+
+### 1.14.0 (2021-12-03)
+* [Change] Bumped core `0.0.19` to `0.0.20`
+
+### 1.13.0 (2021-12-03)
+* [Feature] Installed elastic beanstalk cli into the core image
+* [Feature] Core image now mounts the .aws folder
+* [Change] Switched mysql to 8.0.23 for Drupal builds
+
+### 1.12.1 (2021-11-26)
+* [Bug] Pass along errors thrown in new _.up function so commands correctly come to a stop when errors are thrown
+
 ### 1.12.0 (2021-11-17)
 * [Feature] Test for watertight-node-auto access
 * [Feature] Test for multiple ssh keys

package/commands/setup.js

@@ -8,14 +8,7 @@ module.exports = [
     yargs => {},
     argv => {
         if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal"){
-            _.up(
-                () => execSync(`source ${__dirname}/../intercept.sh && /bin/bash ./_Scripts/setup.sh`, _.opts), 
-                e => {
-                    if(e.status !== 130 && e.status !== 131 && e.status !== 1){
-                        console.log(e.message);
-                    }
-                }
-            );
+            _.up(() => execSync(`source ${__dirname}/../intercept.sh && /bin/bash ./_Scripts/setup.sh`, _.opts));
         } else {
             execSync(`${_.docker} ${_.run}c "npm run setup"`, _.opts);
         }

package/commands/start.js

@@ -15,14 +15,7 @@ module.exports = [
         _.ports.get();
         
         if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal"){
-            _.up(
-                () => execSync(`${_.docker} ${_.exec} core bash -lc "npm start -- -- ${argv.flags.join(' ')}" 2>/dev/null`, _.opts),
-                e => {
-                    if(e.status !== 130 && e.status !== 131 && e.status !== 1){
-                        console.log(e);
-                    }      
-                }
-            );
+            _.up(() => execSync(`${_.docker} ${_.exec} core bash -lc "npm start -- -- ${argv.flags.join(' ')}" 2>/dev/null`, _.opts));
         } else {
             execSync(`${_.docker} ${_.run}c "npm start -- -- ${argv.flags.join(' ')}" 2>/dev/null`, _.opts);
         }

package/core/{0.0.19 → 0.0.20}/Dockerfile

@@ -129,6 +129,13 @@ RUN apt-get install -y dos2unix
 
 RUN apt-get install -y locales
 
+# Install AWS Elastic Beanstalk cli
+RUN apt-get install -y zlib1g-dev libssl-dev libncurses-dev libffi-dev libsqlite3-dev libreadline-dev libbz2-dev
+
+RUN git clone https://github.com/aws/aws-elastic-beanstalk-cli-setup.git
+RUN ./aws-elastic-beanstalk-cli-setup/scripts/bundled_installer
+RUN rm -rf ./aws-elastic-beanstalk-cli-setup
+
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
     locale-gen
 
@@ -198,6 +205,7 @@ export gal="31.170.122.20"\n\
 export grunt="grunt --gruntfile node_modules/@fishawack/core/Gruntfile.js"\n\
 export gruntOld="grunt --gruntfile node_modules/@fishawack/config-grunt/Gruntfile.js"\n\
 export PS1="\[\033[36m\]\u\[\033[m\]@\[\033[32m\]\h:\[\033[33;1m\]\w\[\033[m\]\[\033[31m\]\$(parse_git_branch)\[\033[00m\]\$ "\n\
+export PATH="/root/.ebcli-virtual-env/executables:$PATH"\n\
 alias ls="ls -l -GFh"\n\
 # Load in enviroment variables if they exist in the root of the project\n\
 if [ -f ./env.sh ]; then . ./env.sh; fi\n\

package/core/docker-compose-dev.yml

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

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

@@ -1,10 +1,7 @@
 version: "3.8"
 services:
   core:
-    build: 
-      context: ../../core/${VERSION:-1.0.0}/
-      dockerfile: Dockerfile
-    image: core:${VERSION:-1.0.0}
+    image: fishawack/core:${VERSION:-1.0.0}
     init: true
     tty: true
     volumes:
@@ -12,6 +9,7 @@ services:
       - $HOME/.gitconfig:/root/.gitconfig
       - $HOME/targets:/root/targets
       - $HOME/.ssh:/root/.ssh
+      - $HOME/.aws:/root/.aws
       - node_modules:/app/node_modules
     ports:
       - ${PORT:-3000}:${PORT:-3000}

package/core/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "core",
+  "version": "0.0.20",
+  "description": "lab-env docker config for the @fishawack/core npm module",
+  "scripts": {
+    "postversion": "docker tag fishawack/core:$npm_package_version fishawack/core:latest && docker push fishawack/core:$npm_package_version fishawack/core:latest"
+  },
+  "author": "Mike Mellor",
+  "license": "ISC"
+}

package/drupal/9/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   mysql:
-    image: mysql:8.0.12
+    image: mysql:8.0.23
     networks:
       - default
     environment:

package/globals.js

@@ -4,6 +4,8 @@ const { lstatSync, readdirSync, copyFileSync, existsSync } = require('fs');
 const semver = require('semver');
 const getPort = require('get-port');
 
+process.env.DIRNAME = __dirname;
+
 const isDirectory = source => lstatSync(source).isDirectory();
 const getDirectories = source => readdirSync(source).map(name => path.join(source, name)).filter(isDirectory);
 
@@ -50,26 +52,34 @@ const version = pkg && pkg.devDependencies && (pkg.devDependencies['@fishawack/c
     process.env.VERSION = versions[0];
 // }
 
+var core = `-f ${__dirname}/core/docker-compose.yml`;
+
+// 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
+try {
+    require('mocha');
+    core = `-f ${__dirname}/core/docker-compose-dev.yml ${core}`;
+} catch(e) {}
+
 if(platform === 'laravel'){
     if(!existsSync(path.join(process.cwd(), '.env'))){
         copyFileSync(path.join(process.cwd(), '.env.example'), path.join(process.cwd(), '.env'));
     }
 
-    docker = `docker-compose --env-file ${path.join(process.cwd(), '.env')} -f ${__dirname}/laravel/8/docker-compose.yml -f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml -p ${repo}`;
+    docker = `docker-compose --env-file ${path.join(process.cwd(), '.env')} -f ${__dirname}/laravel/8/docker-compose.yml ${core} -p ${repo}`;
 } else if(platform === 'wordpress'){
     if(!existsSync(path.join(process.cwd(), '.env'))){
         copyFileSync(path.join(process.cwd(), '.env.example'), path.join(process.cwd(), '.env'));
     }
 
-    docker = `docker-compose --env-file ${path.join(process.cwd(), '.env')} -f ${__dirname}/wordpress/5.7.2/docker-compose.yml -f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml -p ${repo}`;
+    docker = `docker-compose --env-file ${path.join(process.cwd(), '.env')} -f ${__dirname}/wordpress/5.7.2/docker-compose.yml ${core} -p ${repo}`;
 } else if(platform === "drupal"){
     if(!existsSync(path.join(process.cwd(), '.env'))){
         copyFileSync(path.join(process.cwd(), '.env.example'), path.join(process.cwd(), '.env'));
     }
     
-    docker = `docker-compose --env-file ${path.join(process.cwd(), '.env')} -f ${__dirname}/drupal/9/docker-compose.yml -f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml -p ${repo}`;
+    docker = `docker-compose --env-file ${path.join(process.cwd(), '.env')} -f ${__dirname}/drupal/9/docker-compose.yml ${core} -p ${repo}`;
 } else  {
-    docker = `docker-compose -f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml -p ${repo}`;
+    docker = `docker-compose ${core} -p ${repo}`;
 }
 
 services = execSync(`${docker} ps --services --filter "status=running"`, {encoding: 'utf8'});
@@ -100,15 +110,21 @@ module.exports = {
                     process.env.PORT_DB = await getPort({port: getPort.makeRange(3306, 3406)});
                 }
             } else {
-                let env = execSync(`${docker} exec -T core env`, {encoding: 'utf8'});
-                let ports = env.split('\n').reduce((obj, d) => { obj[d.split('=')[0]] = d.split('=')[1]; return obj; }, {});
+                try{
+                    let env = execSync(`${docker} exec -T core env`, {encoding: 'utf8'});
+                    let ports = env.split('\n').reduce((obj, d) => { obj[d.split('=')[0]] = d.split('=')[1]; return obj; }, {});
                 
-                process.env.PORT = ports.PORT;
-                process.env.PORT_OPT = ports.PORT_OPT;
-        
-                if(platform === "laravel" || platform === "wordpress" || platform === "drupal"){
-                    process.env.PORT_WEB = ports.PORT_WEB;
-                    process.env.PORT_DB = ports.PORT_DB;
+                    process.env.PORT = ports.PORT;
+                    process.env.PORT_OPT = ports.PORT_OPT;
+            
+                    if(platform === "laravel" || platform === "wordpress" || platform === "drupal"){
+                        process.env.PORT_WEB = ports.PORT_WEB;
+                        process.env.PORT_DB = ports.PORT_DB;
+                    }
+                } catch(e){
+                    console.log(e.message);
+
+                    process.exit(1);
                 }
             }
         },
@@ -127,7 +143,7 @@ module.exports = {
         try{
             cb();
         } catch(e){
-            if(err) err(e);
+            throw(e);
         } finally{
             if(!running) execSync(`lab-env down`, opts);
         }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "1.12.0",
+  "version": "1.15.0",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {
-    "test": "mocha _Test/*.js --timeout 120s --bail",
+    "test": "rm -rf _Test/_fixtures && mocha _Test/*.js --timeout 120s --bail",
     "preversion": "npm test",
     "postversion": "git push && git push --tags && npm publish",
     "postpublish": "git checkout development && git merge master && git push"