@fishawack/lab-env 4.37.0 → 4.38.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## Changelog
 
+### 4.38.0 (2024-11-21)
+
+#### Features
+
+* ability to override nginx config for adonis ([7b301fa](https://bitbucket.org/fishawackdigital/lab-env/commits/7b301fa090bf0a7857f4eca4318365419452d157))
+* **adonis:** can now override base node image on adonis builds ([4a27372](https://bitbucket.org/fishawackdigital/lab-env/commits/4a27372b45644717f848e3d8cdce0e404ffa59cf))
+* can now provide a docker-compose in _Docker dir to append to standard config ([0a9d97d](https://bitbucket.org/fishawackdigital/lab-env/commits/0a9d97d91807fa4a55f1b0c036aedf579c88371b))
+
+#### Bug Fixes
+
+* **adonis:** added software and post deploy scripts to default adonis deployments ([cc67d65](https://bitbucket.org/fishawackdigital/lab-env/commits/cc67d6517eee03b0a0a409416617656057c83204))
+
 ### 4.37.0 (2024-10-22)
 
 #### Features

package/adonis/0/docker-compose.yml

@@ -24,7 +24,12 @@ services:
     ports:
       - "${PORT_WEB:-8000}:80"
   node:
-    image: node:20.6
+    build: 
+      context: $FW_ADONIS_0_NODE_CONTEXT
+      args:
+        version: 20.6
+        image: node
+    image: ${FW_ADONIS_0_NODE_IMAGE:-node}:${FW_ADONIS_0_NODE_VERSION:-20.6}
     working_dir: /app
     restart: always
     networks:

package/commands/create/libs/vars.js

@@ -461,7 +461,10 @@ module.exports.eb = {
         adonis: {
             platform: "nginx",
             language: "node",
-            shared: [],
+            shared: [
+                '.ebextensions/adonis/post-deploy.config',
+                '.ebextensions/adonis/software.config',
+            ],
             low: [],
             high: [],
         },

package/commands/create/templates/elasticbeanstalk/.ebextensions/adonis/post-deploy.config

@@ -1,6 +1,4 @@
 container_commands:
   10-db-import:
-    command: echo 'leader only'
-    leader_only: true
-  20-clear-cache:
-    command: ls
+    command: node ace migration:run --force
+    leader_only: true

package/commands/create/templates/elasticbeanstalk/.ebextensions/adonis/software.config

@@ -1,5 +1,3 @@
 option_settings:
-  aws:elasticbeanstalk:application:environment
-    PORT: 5000
   aws:elasticbeanstalk:environment:proxy:
     ProxyServer: nginx

package/globals.js

@@ -153,6 +153,7 @@ process.env.FW_CORE_1_IMAGE = process.env.FW_CORE_1_IMAGE || `fishawack/lab-env-
 
 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`;
+process.env.FW_ADONIS_0_NODE_IMAGE = process.env.FW_ADONIS_0_NODE_IMAGE || ``;
 
 var core = `-f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml`;
 
@@ -170,6 +171,7 @@ 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;
 process.env.FW_ADONIS_0_NGINX_VERSION = process.env.FW_ADONIS_0_NGINX_VERSION || require('./adonis/0/nginx/package.json').version;
+process.env.FW_ADONIS_0_NODE_VERSION = process.env.FW_ADONIS_0_NODE_VERSION || '';
 
 // Map docker contexts
 process.env.FW_CORE_1_CONTEXT = process.env.FW_CORE_1_CONTEXT || `${__dirname}/core/1/`;
@@ -189,28 +191,52 @@ if(existsSync(path.join(contextOverride, 'Dockerfile'))){
     process.env.FW_LARAVEL_8_NGINX_VERSION = require(`${contextOverride}/package.json`).version;
 }
 
+// ADONIS
 process.env.FW_ADONIS_0_NGINX_CONTEXT = process.env.FW_ADONIS_0_NGINX_CONTEXT || `${__dirname}/adonis/0/nginx/`;
 
+contextOverride = path.join(cwd, '_Docker/adonis/0/nginx');
+if(existsSync(path.join(contextOverride, 'Dockerfile'))){
+    process.env.FW_ADONIS_0_NGINX_CONTEXT = contextOverride;
+    process.env.FW_ADONIS_0_NGINX_IMAGE += `-${repo_safe}`;
+    process.env.FW_ADONIS_0_NGINX_VERSION = require(`${contextOverride}/package.json`).version;
+}
+
+process.env.FW_ADONIS_0_NODE_CONTEXT = process.env.FW_ADONIS_0_NODE_CONTEXT || ``;
+
+contextOverride = path.join(cwd, '_Docker/adonis/0/node');
+if(existsSync(path.join(contextOverride, 'Dockerfile'))){
+    process.env.FW_ADONIS_0_NODE_CONTEXT = contextOverride;
+    process.env.FW_ADONIS_0_NODE_IMAGE = `fishawack/lab-env-adonis-0-node-${repo_safe}`;
+    process.env.FW_ADONIS_0_NODE_VERSION = require(`${contextOverride}/package.json`).version;
+}
+
+// Copy env.example if .env doesnt exist
 if(existsSync(path.join(cwd, '.env.example')) && !existsSync(path.join(cwd, '.env'))){
     copyFileSync(path.join(cwd, '.env.example'), path.join(cwd, '.env'));
 }
 
+// If docker-compose.yml exists in project _Docker folder append to end
+let localOverride = '';
+if(existsSync(path.join(cwd, '_Docker/docker-compose.yml'))){
+    localOverride = `-f ${path.join(cwd, '_Docker/docker-compose.yml')}`;
+}
+
 if(platform === 'laravel'){
     let container = `-f ${__dirname}/laravel/${process.env.VERSION_LARAVEL}/docker-compose.yml`;
 
-    docker = `docker compose --env-file ${path.join(cwd, '.env')} ${container} ${core} -p ${repo_safe}`;
+    docker = `docker compose --env-file ${path.join(cwd, '.env')} ${container} ${core} ${localOverride} -p ${repo_safe}`;
 } else if(platform === 'wordpress'){
-    docker = `docker compose --env-file ${path.join(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} ${localOverride} -p ${repo_safe}`;
 } else if(platform === "drupal"){
     let container = `-f ${__dirname}/drupal/9/docker-compose.yml`;
     
-    docker = `docker compose --env-file ${path.join(cwd, '.env')} ${container} ${core} -p ${repo_safe}`;
+    docker = `docker compose --env-file ${path.join(cwd, '.env')} ${container} ${core} ${localOverride} -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}`;
+    docker = `docker compose --env-file ${path.join(cwd, '.env')} -f ${__dirname}/craftcms/3/docker-compose.yml ${core} ${localOverride} -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}`;
+    docker = `docker compose --env-file ${path.join(cwd, '.env')} -f ${__dirname}/adonis/0/docker-compose.yml ${core} ${localOverride} -p ${repo_safe}`;
 } else  {
-    docker = `docker compose ${core} -p ${repo_safe}`;
+    docker = `docker compose ${core} ${localOverride} -p ${repo_safe}`;
 }
 
 try{

package/package.json

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