@fishawack/lab-env 4.36.0 → 4.38.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 ## 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
+
+* added fullstack permission type that attaches eb permissions ([f98ccaa](https://bitbucket.org/fishawackdigital/lab-env/commits/f98ccaa600f6417e1bf0764ea45f2c512c438ecd))
+* permissions now accepted for IAM users to narrow down access ([507eceb](https://bitbucket.org/fishawackdigital/lab-env/commits/507ecebbabd2feb2d9ced604975a5f86ca9c1aaa))
+
+#### Build Updates
+
+* bumped nodemailer to fix punycode deprecation warning ([db4fd29](https://bitbucket.org/fishawackdigital/lab-env/commits/db4fd294fc39e0455e30319f796f3813f65c2bdc))
+* **core/1:** Bumped lab-env-core-1 ([6d706a9](https://bitbucket.org/fishawackdigital/lab-env/commits/6d706a95e09d75de8758a5b8703056ace009191e))
+
 ### 4.36.0 (2024-10-08)
 
 #### 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/cmds/key.js

@@ -85,7 +85,7 @@ module.exports = [
                     credentials[user] = {};
                 }
 
-                let res = await aws.iam.createFWIAMUser(`fw-automation-${user}`, client);
+                let res = await aws.iam.createFWIAMUser(`fw-automation-${user}`, client, _.config.users.find(d => d.username === user).permissions);
 
                 credentials[user][client] = {
                     key: res.AccessKey && res.AccessKey.AccessKeyId || res.AccessKeyMetadata[0].AccessKeyId,

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/services/aws/iam.js

@@ -24,10 +24,10 @@ module.exports.createIAMUser = async (UserName, account, tags = []) => {
     return res;
 };
 
-module.exports.createFWIAMUser = async (UserName, account) => {
+module.exports.createFWIAMUser = async (UserName, account, permissions) => {
     await module.exports.createIAMUser(UserName, account);
 
-    await module.exports.syncFWIAMPolicies(UserName, account);
+    await module.exports.syncFWIAMPolicies(UserName, account, permissions);
 
     let res = await module.exports.createAccessKeySafe(UserName, account);
 
@@ -73,10 +73,20 @@ module.exports.attachIAMPolicy = async (UserName, account, policy) => {
     return res;
 };
 
-module.exports.syncFWIAMPolicies = async (UserName, account) => {
+module.exports.syncFWIAMPolicies = async (UserName, account, permissions = ["auto-content", "deploy-static"]) => {
     await module.exports.removeAllIAMPolicies(UserName, account);
-    await module.exports.attachIAMPolicy(UserName, account, 'arn:aws:iam::aws:policy/AmazonS3FullAccess');
-    await module.exports.attachIAMPolicy(UserName, account, 'arn:aws:iam::aws:policy/CloudFrontFullAccess');
+
+    if(permissions.includes("auto-content") || permissions.includes("deploy-static")){
+        await module.exports.attachIAMPolicy(UserName, account, 'arn:aws:iam::aws:policy/AmazonS3FullAccess');
+    }
+
+    if(permissions.includes("deploy-static")){
+        await module.exports.attachIAMPolicy(UserName, account, 'arn:aws:iam::aws:policy/CloudFrontFullAccess');
+    }
+    
+    if(permissions.includes("deploy-fullstack")){
+        await module.exports.attachIAMPolicy(UserName, account, 'arn:aws:iam::aws:policy/AdministratorAccess-AWSElasticBeanstalk');
+    }
 };
 
 module.exports.removeIAMPolicy = async (UserName, account, policy) => {

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/core/1/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Changelog
 
+### 1.6.0 (2024-10-22)
+
+#### Features
+
+* own global node_modules folder so local modules can be linked ([82f84fa](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/82f84faa5dfa7c009458bec4fe3a9f2b437c34bf))
+
 ### 1.5.2 (2024-10-08)
 
 #### Bug Fixes

package/core/1/entrypoint.sh

@@ -8,6 +8,9 @@ if [ -z "$FW_ROOT" ]; then
     # Own the node_modules folder otherwise it'll be owned by root/previous node id which will prevent writing
     chown node /app/node_modules
 
+    # Own the global node_modules folder otherwise it'll be owned by root/previous node id which will prevent writing
+    chown node /usr/local/lib/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

package/core/1/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core",
-  "version": "1.5.2",
+  "version": "1.6.0",
   "description": "lab-env docker config for the @fishawack/core/1 npm module",
   "scripts": {
     "image": "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 ."

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.36.0",
+  "version": "4.38.0",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {
@@ -35,7 +35,7 @@
     "glob": "7.1.7",
     "inquirer": "8.1.2",
     "lodash": "^4.17.21",
-    "nodemailer": "^6.7.8",
+    "nodemailer": "^6.9.15",
     "ora": "5.4.1",
     "semver": "7.3.4",
     "update-notifier": "^6.0.2",