@fishawack/lab-env 4.27.0 → 4.29.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## Changelog
 
+### 4.29.0 (2024-06-05)
+* [Feature] added adonis support
+* [Feature] added adonis options to provision and new
+* [Bug] display all ports for adonis builds
+* [Bug] protect against no package.json being present
+* [Bug] protect against missing deps from package.json
+* [Change] Bumped fishawack/lab-env-adonis-0-nginx to 1.0.0
+* [Change] Bumped fishawack/lab-env-core-1 to 1.4.0
+
+### 4.28.0 (2024-05-17)
+* [Feature] added new clients
+* [Bug] add session driver cookie to laravel high avail option
+
 ### 4.27.0 (2024-04-08)
 * [Feature] can now provision fullstack environments
 * [Feature] added new clients

package/_Test/boilerplate-adonis.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const repo = `boilerplate-adonis`;
+const opts = {encoding: 'utf8', stdio: 'inherit', cwd: `_Test/_fixtures/${repo}`};
+
+const expect = require('chai').expect;
+const execSync = require('child_process').execSync;
+
+describe('deploy', () => {
+    before(function(){
+        this.timeout(60000 * 10);
+
+        execSync(`git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
+
+        execSync('node ../../../cli.js setup', opts);
+
+        execSync('node ../../../cli.js prod', opts);
+    });
+    
+    it(`All ${repo} tests should pass`, async () => {
+        expect(execSync('node ../../../cli.js test', opts)).to.not.equal(Error);
+    });
+
+    after(() => {
+        execSync('node ../../../cli.js nuke', opts)
+
+        execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
+    });
+});

package/adonis/0/docker-compose.yml

@@ -0,0 +1,40 @@
+services:
+  mysql:
+    image: mysql:8.0.32
+    networks:
+      - default
+    environment:
+      - MYSQL_ROOT_PASSWORD=password
+      - MYSQL_DATABASE=${DB_DATABASE}
+      - MYSQL_USER=${DB_USER}
+      - MYSQL_PASSWORD=${DB_PASSWORD}
+    ports:
+      - "${PORT_DB:-3306}:3306"
+    volumes:
+      - mysql:/var/lib/mysql
+  nginx:
+    build: 
+      context: $FW_ADONIS_0_NGINX_CONTEXT
+      target: development
+    image: $FW_ADONIS_0_NGINX_IMAGE:${FW_ADONIS_0_NGINX_VERSION:-latest}
+    networks:
+      - default
+    volumes:
+      - $CWD/:/app
+    ports:
+      - "${PORT_WEB:-8000}:80"
+  node:
+    image: node:20.6
+    working_dir: /app
+    networks:
+      - default
+    volumes:
+      - $CWD/:/app
+      - node_modules:/app/node_modules
+    command: npm run dev
+networks:
+  default:
+    driver: "bridge"
+volumes:
+  mysql:
+    driver: "local"

package/adonis/0/nginx/CHANGELOG.md

@@ -0,0 +1,4 @@
+## Changelog
+
+### 1.0.0 (2024-06-04)
+* [misc] initial release

package/adonis/0/nginx/Dockerfile

@@ -0,0 +1,11 @@
+FROM nginx:1.19 AS development
+
+MAINTAINER Mike Mellor
+
+# Copy nginx conf
+COPY ./nginx.conf /etc/nginx/conf.d/default.conf
+
+FROM fishawack/lab-env-adonis-0-nginx:latest AS production
+
+# Copy source code into container
+COPY . /app

package/adonis/0/nginx/nginx.conf

@@ -0,0 +1,16 @@
+server {
+    listen 80;
+    listen [::]:80;
+
+    location / {
+        proxy_pass http://node:3333;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_cache_bypass $http_upgrade;
+    }
+}

package/adonis/0/nginx/package.json

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

package/cli.js

@@ -69,6 +69,10 @@ const args = hideBin(process.argv);
         if(_.platform === "wordpress"){
             commands.push('wp');
         }
+        
+        if(_.platform === "adonis"){
+            commands.push('ace', 'node');
+        }
 
         if(_.platform === "laravel" || (_.platform === "wordpress" && process.env.VERSION_WORDPRESS !== "0") || _.platform === "drupal" || _.platform === "craftcms"){
             commands.push('composer', 'php');

package/commands/ace.js

@@ -0,0 +1,13 @@
+const _ = require('../globals.js');
+
+module.exports = [
+    ['ace [command...]', 'art'],
+    'run ace command',
+    yargs => {
+        yargs.positional('command', {
+                describe: 'command to run',
+                default: ''
+            });
+    },
+    argv => _.up(() => _.command("node", `node ace ${argv.command.join(' ')}`))
+];

package/commands/create/libs/vars.js

@@ -87,6 +87,10 @@ module.exports.templates = [
         "name": "boilerplate-craftcms",
         "type": "boilerplate"
     },
+    {
+        "name": "boilerplate-adonis",
+        "type": "boilerplate"
+    },
     {
         "name": "sprinkle-base",
         "type": "framework",
@@ -132,6 +136,10 @@ module.exports.frameworks = [
         "name": "drupal",
         "value": "drupal"
     },
+    {
+        "name": "adonis",
+        "value": "adonis"
+    },
 ];
 
 // Elasticbeanstlak configs based on preconfigurations
@@ -243,7 +251,10 @@ module.exports.eb = {
                 { OptionName: 'FILESYSTEM_DISK_PUBLIC', Value: "s3-public", Namespace: 'aws:elasticbeanstalk:application:environment' },
             ],
             low: [],
-            high: []
+            high: [
+                { OptionName: 'SESSION_DRIVER', Value: "cookie", Namespace: 'aws:elasticbeanstalk:application:environment' },
+                { OptionName: 'SESSION_SECURE_COOKIE', Value: "true", Namespace: 'aws:elasticbeanstalk:application:environment' },
+            ]
         },
         drupal: {
             shared: [],

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

@@ -12,7 +12,7 @@ module.exports.ec2 = require("./ec2.js");
 
 module.exports.slug = (repo, client, branch, service = "s3") => nameSafe(`${branch}-${repo}-${client}`, service);
 
-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', 'relievantmedsystems', 'gilead'];
+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', 'relievantmedsystems', 'gilead', 'alexion'];
 
 module.exports.static = async (name, account, tags = [], credentials = []) => {
     let s3 = await module.exports.s3.createS3Bucket(name, account, tags);

package/commands/deploy.js

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

package/commands/node.js

@@ -0,0 +1,13 @@
+const _ = require('../globals.js');
+
+module.exports = [
+    'node [command...]',
+    'run node command',
+    yargs => {
+        yargs.positional('command', {
+                describe: 'command to run',
+                default: ''
+            });
+    },
+    argv => _.command("node", `node ${argv.command.join(' ')}`)
+];

package/commands/setup.js

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

package/commands/start.js

@@ -14,7 +14,7 @@ module.exports = [
 
         const command = () => _.command("core", `npm start -- -- ${argv.flags.join(' ')}`, true);
         
-        if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal" || _.platform === "craftcms"){
+        if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal" || _.platform === "craftcms" || _.platform === "adonis"){
             _.up(command);
         } else {
             command();

package/commands/test.js

@@ -11,6 +11,10 @@ module.exports = [
             if(_.platform === "laravel"){
                 _.command("php", `php artisan test`);
             }
+            
+            if(_.platform === "adonis"){
+                _.command("node", `node ace test`);
+            }
         });
     }
 ];

package/commands/watch.js

@@ -16,7 +16,7 @@ module.exports = [
 
             const command = () => _.command("core", `${prep}browserSync watch`, true);
             
-            if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal" || _.platform === "craftcms"){
+            if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal" || _.platform === "craftcms" || _.platform === "adonis"){
                 _.up(command);
             } else {
                 command();

package/core/1/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Changelog
 
+### 1.4.0 (2024-06-04)
+* [feat] bumped node from 18 to 20
+
 ### 1.3.3 (2024-02-09)
 * [fix] symlink wine64 now htat wine is the default global command but electron expects wine64
 

package/core/1/Dockerfile

@@ -2,7 +2,7 @@
 # Alpine image
 #####
 
-FROM node:18 AS alpine
+FROM node:20.6 AS alpine
 
 MAINTAINER Mike Mellor
 

package/core/1/package.json

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

package/globals.js

@@ -110,6 +110,8 @@ if(composer && composer.require && composer.require['laravel/framework']){
         // Default to latest image when outside of known core versions
         process.env.VERSION_WORDPRESS = versions[versions.length - 1];
     }
+} else if (pkg && pkg.dependencies && pkg.dependencies['@adonisjs/core']) {
+    platform = 'adonis';
 } else {
     // Check for old wordpress repo stucture and show warning
     try{ 
@@ -149,6 +151,7 @@ process.env.FW_CORE_1_TARGET = process.env.FW_CORE_1_TARGET || (process.env.FW_F
 process.env.FW_CORE_1_IMAGE = process.env.FW_CORE_1_IMAGE || `fishawack/lab-env-core-1${process.env.FW_CORE_1_TARGET_IMAGE}`;
 
 process.env.FW_LARAVEL_8_NGINX_IMAGE = process.env.FW_LARAVEL_8_NGINX_IMAGE || `fishawack/lab-env-laravel-8-nginx`;
+process.env.FW_ADONIS_0_NGINX_IMAGE = process.env.FW_ADONIS_0_NGINX_IMAGE || `fishawack/lab-env-adonis-0-nginx`;
 
 var core = `-f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml`;
 
@@ -165,6 +168,7 @@ process.env.FW_CRAFTCMS_3_APACHE_VERSION = process.env.FW_CRAFTCMS_3_APACHE_VERS
 process.env.FW_WORDPRESS_0_VERSION = process.env.FW_WORDPRESS_0_VERSION || require('./wordpress/0/package.json').version;
 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;
+process.env.FW_ADONIS_0_NGINX_VERSION = process.env.FW_ADONIS_0_NGINX_VERSION || require('./adonis/0/nginx/package.json').version;
 
 // Map docker contexts
 process.env.FW_CORE_1_CONTEXT = process.env.FW_CORE_1_CONTEXT || `${__dirname}/core/1/`;
@@ -184,6 +188,8 @@ if(existsSync(path.join(contextOverride, 'Dockerfile'))){
     process.env.FW_LARAVEL_8_NGINX_VERSION = require(`${contextOverride}/package.json`).version;
 }
 
+process.env.FW_ADONIS_0_NGINX_CONTEXT = process.env.FW_ADONIS_0_NGINX_CONTEXT || `${__dirname}/adonis/0/nginx/`;
+
 if(existsSync(path.join(cwd, '.env.example')) && !existsSync(path.join(cwd, '.env'))){
     copyFileSync(path.join(cwd, '.env.example'), path.join(cwd, '.env'));
 }
@@ -200,6 +206,8 @@ if(platform === 'laravel'){
     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(cwd, '.env')} -f ${__dirname}/craftcms/3/docker-compose.yml ${core} -p ${repo_safe}`;
+} else if(platform === "adonis"){
+    docker = `docker compose --env-file ${path.join(cwd, '.env')} -f ${__dirname}/adonis/0/docker-compose.yml ${core} -p ${repo_safe}`;
 } else  {
     docker = `docker compose ${core} -p ${repo_safe}`;
 }
@@ -234,7 +242,7 @@ let volumes = [
     'node_modules'
 ];
 
-if(platform === "laravel" || platform === "wordpress" || platform === "drupal" || platform === "craftcms"){
+if(platform === "laravel" || platform === "wordpress" || platform === "drupal" || platform === "craftcms" || platform === "adonis"){
     volumes.push(
         'mysql'
     );
@@ -286,7 +294,7 @@ module.exports = {
                 process.env.PORT = await getPort({port: getPort.makeRange(3000, 3100)});
                 process.env.PORT_OPT = +process.env.PORT + 1;
         
-                if(platform === "laravel" || platform === "wordpress" || platform === "drupal" || platform === "craftcms"){
+                if(platform === "laravel" || platform === "wordpress" || platform === "drupal" || platform === "craftcms" || platform === "adonis"){
                     process.env.PORT_WEB = await getPort({port: getPort.makeRange(8000, 8100)});
                     process.env.PORT_DB = await getPort({port: getPort.makeRange(3306, 3406)});
                     process.env.PORT_ES = await getPort({port: getPort.makeRange(9200, 9300)});

package/intercept.sh

@@ -24,10 +24,18 @@ wp(){
     command lab-env wp "$@"
 }
 
+ace(){
+    command lab-env ace "$@"
+}
+
 php(){
     command lab-env php "$@"
 }
 
+node(){
+    command lab-env node "$@"
+}
+
 chmod(){
     command lab-env exec "chmod $@"
 }
@@ -59,6 +67,7 @@ export -f artisan;
 export -f craft;
 export -f wp;
 export -f php;
+export -f node;
 export -f chown;
 export -f chmod;
 export -f chgrp;

package/package.json

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