@fishawack/lab-env 4.22.1 → 4.25.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## Changelog
 
+### 4.25.0 (2023-10-24)
+* [Change] Bumped fishawack/lab-env-core-1 to 1.3.1
+* [Bug] when services not running exit with status code of 1
+
+### 4.24.0 (2023-10-24)
+* [Misc] no changes due to issue with deployment
+
+### 4.23.0 (2023-10-24)
+* [Feature] add target and target_image args to dockerfile build process to overrides can switch between full and alpine
+* [Feature] added new clients
+* [Feature] automatically override docker context and image name if core found in correct folder structure
+* [Feature] can now override target and image env variables
+* [Feature] can now specify docker context as env variable
+
 ### 4.22.1 (2023-08-14)
 * [Change] Bumped fishawack/lab-env-craftcms-3-php to 1.0.1
 * [Change] Bumped fishawack/lab-env-drupal-9-php to 0.6.1

package/commands/create/services/aws/index.js

@@ -6,7 +6,7 @@ module.exports.iam = require("./iam.js");
 
 module.exports.slug = (repo, client, branch) => s3Safe(`${branch}-${repo}-${client}`);
 
-module.exports.clients = ['fishawack', 'abbvie', 'sanofigenzyme', 'gsk', 'janssen', 'astrazeneca', 'ptc', 'jazz', 'pfizer', 'heron', 'novartis', 'training', 'merck', 'acadia', 'travere', 'roche', 'utc', 'bayer', 'alcon', 'uhc', 'chiesi', '3m', 'sarepta', 'ipsen', 'novocure', 'anthem', 'kyowakirin', 'optum', 'rally', 'menarini', 'childrensminnesota', 'gore'];
+module.exports.clients = ['fishawack', 'abbvie', 'sanofigenzyme', 'gsk', 'janssen', 'astrazeneca', 'ptc', 'jazz', 'pfizer', 'heron', 'novartis', 'training', 'merck', 'acadia', 'travere', 'roche', 'utc', 'bayer', 'alcon', 'uhc', 'chiesi', '3m', 'sarepta', 'ipsen', 'novocure', 'anthem', 'kyowakirin', 'optum', 'rally', 'menarini', 'childrensminnesota', 'gore', 'axogen', 'gedeonrichter'];
 
 module.exports.static = async (name, account, tags = [], credentials = []) => {
     let s3 = await module.exports.s3.createS3Bucket(name, account, tags);

package/core/1/docker-compose.yml

@@ -2,11 +2,14 @@ version: "3.8"
 services:
   core:
     build: 
-      context: $DIRNAME/core/1/
-      target: ${FW_CORE_1_TARGET:-alpine}
+      context: $FW_CORE_1_CONTEXT
+      target: $FW_CORE_1_TARGET
       ssh:
         - default
-    image: ${FW_CORE_1_IMAGE:-fishawack/lab-env-core-1-alpine}:${FW_CORE_1_VERSION:-latest}
+      args:
+        target: $FW_CORE_1_TARGET
+        target_image: $FW_CORE_1_TARGET_IMAGE
+    image: $FW_CORE_1_IMAGE:${FW_CORE_1_VERSION:-latest}
     init: true
     tty: true
     volumes:

package/core/1/package.json

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

package/globals.js

@@ -12,6 +12,8 @@ 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 cwd = process.cwd();
+
 const isDirectory = source => lstatSync(source).isDirectory();
 const getDirectories = source => readdirSync(source).map(name => path.join(source, name)).filter(isDirectory);
 
@@ -45,18 +47,18 @@ try{
 }
 
 try{
-    repo = execSync('basename "$(git rev-parse --show-toplevel)"', {encoding: 'utf8', stdio: 'pipe'}).trim() || path.basename(process.cwd());
+    repo = execSync('basename "$(git rev-parse --show-toplevel)"', {encoding: 'utf8', stdio: 'pipe'}).trim() || path.basename(cwd);
 } catch(e){
-    repo = path.basename(process.cwd());
+    repo = path.basename(cwd);
 }
 
 const repo_safe = repo.replace(/\./g, '');
 
-try{ pkg = require(path.join(process.cwd(), 'package.json')); } catch(e){}
+try{ pkg = require(path.join(cwd, 'package.json')); } catch(e){}
 
-try{ composer = require(path.join(process.cwd(), 'composer.json')); } catch(e){}
+try{ composer = require(path.join(cwd, 'composer.json')); } catch(e){}
 
-try{ wordpress = existsSync(path.join(process.cwd(), 'wp-content/')); } catch(e){}
+try{ wordpress = existsSync(path.join(cwd, 'wp-content/')); } catch(e){}
 
 if(composer && composer.require && composer.require['laravel/framework']){
     platform = 'laravel';
@@ -109,7 +111,7 @@ if(composer && composer.require && composer.require['laravel/framework']){
 } else {
     // Check for old wordpress repo stucture and show warning
     try{ 
-        if(existsSync(path.join(process.cwd(), 'themes/'))){
+        if(existsSync(path.join(cwd, 'themes/'))){
             console.log(`This wordpress repo needs migrating to the new repo structure: \n${utilities.colorize(`https://demo.fishawack.solutions/Lab/Doc/#lab-env-migrating-200`, 'title')}`)
             process.exit(1);
         }
@@ -140,10 +142,9 @@ if(process.env.FW_NEXT){
 }
 
 // Map full image or alpine
-if(process.env.FW_FULL){
-    process.env.FW_CORE_1_IMAGE = "fishawack/lab-env-core-1";
-    process.env.FW_CORE_1_TARGET = "full";
-}
+process.env.FW_CORE_1_TARGET_IMAGE = process.env.FW_CORE_1_TARGET_IMAGE || (process.env.FW_FULL ? "" : "-alpine");
+process.env.FW_CORE_1_TARGET = process.env.FW_CORE_1_TARGET || (process.env.FW_FULL ? "full" : "alpine");
+process.env.FW_CORE_1_IMAGE = process.env.FW_CORE_1_IMAGE || `fishawack/lab-env-core-1${process.env.FW_CORE_1_TARGET_IMAGE}`;
 
 var core = `-f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml`;
 
@@ -161,22 +162,31 @@ process.env.FW_WORDPRESS_0_VERSION = process.env.FW_WORDPRESS_0_VERSION || requi
 process.env.FW_WORDPRESS_1_PHP_VERSION = process.env.FW_WORDPRESS_1_PHP_VERSION || require('./wordpress/1/php/package.json').version;
 process.env.FW_WORDPRESS_1_APACHE_VERSION = process.env.FW_WORDPRESS_1_APACHE_VERSION || require('./wordpress/1/apache/package.json').version;
 
-if(existsSync(path.join(process.cwd(), '.env.example')) && !existsSync(path.join(process.cwd(), '.env'))){
-    copyFileSync(path.join(process.cwd(), '.env.example'), path.join(process.cwd(), '.env'));
+// Map docker contexts
+process.env.FW_CORE_1_CONTEXT = process.env.FW_CORE_1_CONTEXT || `${__dirname}/core/1/`;
+
+let contextOverride = path.join(cwd, '_Docker/core/1/');
+if(existsSync(path.join(contextOverride, 'Dockerfile'))){
+    process.env.FW_CORE_1_CONTEXT = contextOverride;
+    process.env.FW_CORE_1_IMAGE += `-${repo_safe}`;
+}
+
+if(existsSync(path.join(cwd, '.env.example')) && !existsSync(path.join(cwd, '.env'))){
+    copyFileSync(path.join(cwd, '.env.example'), path.join(cwd, '.env'));
 }
 
 if(platform === 'laravel'){
     let container = `-f ${__dirname}/laravel/${process.env.VERSION_LARAVEL}/docker-compose.yml`;
 
-    docker = `docker compose --env-file ${path.join(process.cwd(), '.env')} ${container} ${core} -p ${repo_safe}`;
+    docker = `docker compose --env-file ${path.join(cwd, '.env')} ${container} ${core} -p ${repo_safe}`;
 } else if(platform === 'wordpress'){
-    docker = `docker compose --env-file ${path.join(process.cwd(), '.env')} -f ${__dirname}/wordpress/${process.env.VERSION_WORDPRESS}/docker-compose.yml ${core} -p ${repo_safe}`;
+    docker = `docker compose --env-file ${path.join(cwd, '.env')} -f ${__dirname}/wordpress/${process.env.VERSION_WORDPRESS}/docker-compose.yml ${core} -p ${repo_safe}`;
 } else if(platform === "drupal"){
     let container = `-f ${__dirname}/drupal/9/docker-compose.yml`;
     
-    docker = `docker compose --env-file ${path.join(process.cwd(), '.env')} ${container} ${core} -p ${repo_safe}`;
+    docker = `docker compose --env-file ${path.join(cwd, '.env')} ${container} ${core} -p ${repo_safe}`;
 } else if(platform === "craftcms"){
-    docker = `docker compose --env-file ${path.join(process.cwd(), '.env')} -f ${__dirname}/craftcms/3/docker-compose.yml ${core} -p ${repo_safe}`;
+    docker = `docker compose --env-file ${path.join(cwd, '.env')} -f ${__dirname}/craftcms/3/docker-compose.yml ${core} -p ${repo_safe}`;
 } else  {
     docker = `docker compose ${core} -p ${repo_safe}`;
 }
@@ -203,7 +213,7 @@ if(args[0] !== 'diag' && args[0] !== 'diagnose' && args[0] !== 'origin' && args[
     // Stop here if docker process not running
     } else if(!services) {
         console.log(`${utilities.colorize(`Docker`, 'info')} does not appear to be running...\n\nRun ${utilities.colorize(`fw --debug`, 'success')} for more information`);
-        process.exit();
+        process.exit(1);
     }
 }
 

package/package.json

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