@fishawack/lab-env 4.33.3 → 4.35.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 ## Changelog
 
+### 4.35.0 (2024-09-26)
+
+#### Features
+
+* added new mtpa client ([dce9679](https://bitbucket.org/fishawackdigital/lab-env/commits/dce96797ebdfd722b8094bca01d38866fd762a54))
+* re-provisioned static sites now ensure all cloudfront functions are set ([5ac017b](https://bitbucket.org/fishawackdigital/lab-env/commits/5ac017bb727bb80cffe545973fd6ffb61d17217b))
+* support provisioning adonis envs ([4d73174](https://bitbucket.org/fishawackdigital/lab-env/commits/4d731746ea6227c0241eb32d1c9002734800d31e))
+
+#### Bug Fixes
+
+* **adonis:** added port and log level to adonis provision command ([b5940b8](https://bitbucket.org/fishawackdigital/lab-env/commits/b5940b844b801cb9c7f2684b61bb6ba684237860))
+* dont create FW_DIR directories as they already exist in the image ([aa3c646](https://bitbucket.org/fishawackdigital/lab-env/commits/aa3c646014ca31f14c99138963e8922a47b19ac7))
+* egnyte check now correctly returns fail or pass result ([8e232ed](https://bitbucket.org/fishawackdigital/lab-env/commits/8e232edd658080ed83e5bb4699518fe741fd91be))
+* enforce lowercase repo names and start and end with digit or letter ([03c473e](https://bitbucket.org/fishawackdigital/lab-env/commits/03c473e1d569bce1792ef98ab23d68e84ba18c5f))
+* remove response cloudfront function on deprov ([8343740](https://bitbucket.org/fishawackdigital/lab-env/commits/83437405b7d7cb98f78ecbad8ea52becf0128cab))
+* set custom error response on re-provision command ([c162e4a](https://bitbucket.org/fishawackdigital/lab-env/commits/c162e4a016ced36586eb828cea6be1d5ede925fa))
+* set FW_DIR to aws runner home and test mail ([b085d9e](https://bitbucket.org/fishawackdigital/lab-env/commits/b085d9ee2a474095131b182134358b3180e03818))
+* static sites now attach response function with security headers ([28e192d](https://bitbucket.org/fishawackdigital/lab-env/commits/28e192d6fbc5ccf64560b1be15aa5e2b527ba345))
+* use consistent bitbucket pipeline as standard projects ([8b19b1c](https://bitbucket.org/fishawackdigital/lab-env/commits/8b19b1cf224b1ae7606f1d43b1ca4a17f9c88ebf))
+* use slug and nameSafe to response cloudfront response ([28e30eb](https://bitbucket.org/fishawackdigital/lab-env/commits/28e30ebb35df8bbd96300f090f4deeffce5d13a0))
+
+### 4.34.0 (2024-08-21)
+* [Feature] enable pipelines by default when running new command
+* [Bug] limit elasticsearch memory size so it doesnt attempt to take up all the space
+* [Bug] point to new archivel ocation for auto ssl scripts
+* [Bug] remove art alias
+
 ### 4.33.3 (2024-07-23)
 * [Bug] set node container to always restart
 
@@ -638,4 +665,4 @@
 * [Docs] Added readme and changelog to repo
 
 ### 0.0.1 (2021-01-11)
-* [Misc] Initial release
+* [Misc] Initial release

package/bitbucket-pipelines.yml

@@ -0,0 +1,62 @@
+definitions:
+  services:
+    docker:
+      image: docker:dind
+      memory: 12288
+
+pipelines:
+  default:
+    - step:
+        image: fishawack/aws-runner
+        runs-on:
+          - self.hosted
+          - linux
+          - production
+        size: 4x
+        script:
+          # Set global repository CI flags
+          - export BRANCH=$BITBUCKET_BRANCH REPO=$BITBUCKET_REPO_SLUG
+          # Set FW DIR to project repo as that's the only location that's mountable
+          - export FW_DIR=/home/aws-runner
+          # Fetch secure AWS credentials from workspace variables
+          - echo $AWS_CREDENTIALS | base64 -d > $FW_DIR/.aws/credentials
+          # Fetch secure Egnyte credentials from workspace variables
+          - echo $EGNYTE_CREDENTIALS | base64 -d > $FW_DIR/targets/ftp-fishawack.egnyte.com.json
+          # Fetch secure Mail credentials from workspace variables
+          - jq --argjson JSON "$(echo $MAIL_CREDENTIALS | base64 -d)" '. += $JSON' $FW_DIR/targets/misc.json > $FW_DIR/targets/_misc.json
+          # Copy new merged misc to final location
+          - cp $FW_DIR/targets/_misc.json $FW_DIR/targets/misc.json
+          # Enable FULL docker images
+          - export FW_FULL=1
+          # Own the git dir as aws-runner so that a non-root user id can be mapped to each container
+          - chown -R aws-runner:aws-runner . /build
+          # Write ssh config to aws-runner so any bitbucket pipeline keys can be used by the user
+          - cat ~/.ssh/config >> $FW_DIR/.ssh/config
+          # Copy ssh dir to project dir so lab-env has access to keys
+          - su aws-runner -c 'cp /build/*/ssh/* $FW_DIR/.ssh/'
+          # Start ssh agent and add all (if any) keys
+          - eval `ssh-agent` && ssh-add || true
+          # Own the .tmp folder as aws-runner so that a non-root user id can be mapped to each container
+          - chown -R aws-runner:aws-runner /tmp
+          # Install
+          - su aws-runner -c 'npm ci'
+          # Test
+          - su aws-runner -c 'npm test'
+        services:
+          - docker
+  branches:
+    master:
+      - step:
+          image: fishawack/aws-runner
+          runs-on:
+            - self.hosted
+            - linux
+            - production
+          size: 4x
+          script:
+            # Install release deps
+            - npm install -g semantic-release@24 @semantic-release/changelog@6 @semantic-release/git@10 conventional-changelog-conventionalcommits@8
+            # Release version
+            - semantic-release --repositoryUrl=https://$GIT_CREDENTIALS@bitbucket.org/$BITBUCKET_REPO_FULL_NAME
+            # Sync development after publish
+            - git fetch origin "+refs/heads/*:refs/remotes/origin/*" && git checkout -b development origin/development && git merge master && git push origin development

package/commands/ace.js

@@ -1,7 +1,7 @@
 const _ = require('../globals.js');
 
 module.exports = [
-    ['ace [command...]', 'art'],
+    ['ace [command...]'],
     'run ace command',
     yargs => {
         yargs.positional('command', {

package/commands/create/cmds/new.js

@@ -35,11 +35,13 @@ module.exports = [
             name = `${template.prefix}-${name}`;
         }
         
-        if(/^[a-zA-Z0-9-_.]+$/.test(name)){
+        if(/^[a-z0-9][a-z0-9-_.]+[a-z0-9]$/.test(name)){
             // Create Remote Repositories
             if(!await bitbucket.exists(name)){
                 if(await bitbucket.exists(template.name)){
                     await bitbucket.fork(name, template);
+                    
+                    await bitbucket.enablePipelines(name);
 
                     execSync(`echo "git clone ${vars.urls.bitbucketSSH}/${name}" | pbcopy`);
                 
@@ -47,7 +49,7 @@ module.exports = [
                 }
             }
         } else {
-            console.log(utilities.colorize(`Repo name can contain only letters, digits, '_', '-' and '.'`, 'helper'));
+            console.log(utilities.colorize(`Repo names must contain only lowercase letters, decimal digits, dashes, and underscores, and must begin & end with a lowercase letter or decimal digit.`, 'helper'));
         }
     }
 ];

package/commands/create/libs/vars.js

@@ -263,6 +263,36 @@ module.exports.eb = {
                 { OptionName: 'SESSION_SECURE_COOKIE', Value: "true", Namespace: 'aws:elasticbeanstalk:application:environment' },
             ]
         },
+        adonis: {
+            shared: [
+                {
+                    OptionName: 'NODE_ENV',
+                    Value: 'production',
+                    Namespace: 'aws:elasticbeanstalk:application:environment'
+                },
+                {
+                    OptionName: 'APP_KEY',
+                    Value: `base64:${Buffer.from(generator.generate({ length: 32, numbers: true, symbols: true })).toString('base64')}`,
+                    Namespace: 'aws:elasticbeanstalk:application:environment'
+                },
+                {
+                    OptionName: 'APP_URL',
+                    Value: 'https://<%= DOMAIN_LINK %>',
+                    Namespace: 'aws:elasticbeanstalk:application:environment'
+                },
+                { OptionName: 'SESSION_DRIVER', Value: "cookie", Namespace: 'aws:elasticbeanstalk:application:environment' },
+                { OptionName: 'AWS_BUCKET', Value: "<%= s3Slug %>", Namespace: 'aws:elasticbeanstalk:application:environment' },
+                { OptionName: 'AWS_DEFAULT_REGION', Value: "<%= AWS_REGION %>", Namespace: 'aws:elasticbeanstalk:application:environment' },
+                { OptionName: 'AWS_ACCESS_KEY_ID', Value: "<%= AccessKeyId %>", Namespace: 'aws:elasticbeanstalk:application:environment' },
+                { OptionName: 'AWS_SECRET_ACCESS_KEY', Value: "<%= SecretAccessKey %>", Namespace: 'aws:elasticbeanstalk:application:environment' },
+                { OptionName: 'FILESYSTEM_DISK', Value: "s3", Namespace: 'aws:elasticbeanstalk:application:environment' },
+                { OptionName: 'FILESYSTEM_DISK_PUBLIC', Value: "s3-public", Namespace: 'aws:elasticbeanstalk:application:environment' },
+                { OptionName: 'PORT', Value: "3333", Namespace: 'aws:elasticbeanstalk:application:environment' },
+                { OptionName: 'LOG_LEVEL', Value: "info", Namespace: 'aws:elasticbeanstalk:application:environment' },
+            ],
+            low: [],
+            high: []
+        },
         drupal: {
             shared: [],
             low: [],
@@ -428,6 +458,13 @@ module.exports.eb = {
             low: [],
             high: [],
         },
+        adonis: {
+            platform: "nginx",
+            language: "node",
+            shared: [],
+            low: [],
+            high: [],
+        },
         drupal: {
             platform: "httpd",
             language: "php",
@@ -461,4 +498,54 @@ module.exports.eb = {
     config(){
         return template(fs.readFileSync(`${__dirname}/../templates/elasticbeanstalk/.elasticbeanstalk/config.yml`, {encoding: 'utf8'}))(process.env);
     }
-};
+};
+
+// Cloudfront distribution config
+module.exports.cloudfront = (name, region, FunctionARNResponse, FunctionARNRequest, OAI) => ({
+    DistributionConfig: { 
+        Enabled: true,
+        CallerReference: name,
+        Comment: `lab-env provisioned CloudFront distribution for project ${name}`,
+        CustomErrorResponses: {
+            Items: [
+                {
+                    ErrorCachingMinTTL: 0,
+                    ErrorCode: 404,
+                    ResponseCode: 200,
+                    ResponsePagePath: '/index.html'
+                }
+            ],
+            Quantity: 1
+        },
+        DefaultCacheBehavior: { 
+            Compress: true,
+            TargetOriginId: `${name}.s3.${region}.amazonaws.com`,
+            ViewerProtocolPolicy: 'redirect-to-https',
+            CachePolicyId: '658327ea-f89d-4fab-a63d-7e88639e58f6', // Built in, Managed AWS Policy - Cache Optimized
+            FunctionAssociations: {
+                Items: [
+                    {
+                        EventType: 'viewer-response',
+                        FunctionARN: FunctionARNResponse
+                    }
+                ].concat(FunctionARNRequest ? {
+                    EventType: 'viewer-request',
+                    FunctionARN: FunctionARNRequest
+                } : []),
+                Quantity: 2
+            }
+        },
+        Origins: {
+            Items: [
+                {
+                    DomainName: `${name}.s3.${region}.amazonaws.com`,
+                    Id: `${name}.s3.${region}.amazonaws.com`,
+                    S3OriginConfig: {
+                        OriginAccessIdentity: `origin-access-identity/cloudfront/${OAI.CloudFrontOriginAccessIdentity.Id}`
+                    }
+                }
+            ],
+            Quantity: 1
+        }
+    },
+});

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

@@ -1,9 +1,11 @@
 const { CloudFrontClient, CreateDistributionWithTagsCommand, CreateCloudFrontOriginAccessIdentityCommand, DeleteDistributionCommand , DeleteCloudFrontOriginAccessIdentityCommand, GetDistributionCommand, UpdateDistributionCommand, GetCloudFrontOriginAccessIdentityCommand, CreateFunctionCommand, GetFunctionCommand, UpdateFunctionCommand, PublishFunctionCommand, DeleteFunctionCommand, DescribeFunctionCommand } = require("@aws-sdk/client-cloudfront");
 const fs = require('fs');
+const { merge } = require('lodash');
 const { Spinner, poll } = require('../../libs/utilities');
+const { cloudfront } = require('../../libs/vars');
 const { createClient } = require('./misc.js');
 
-module.exports.createCloudFrontDistribution = async (name, account, tags = [], FunctionARN = null, region = 'us-east-1') => {
+module.exports.createCloudFrontDistribution = async (name, account, tags = [], FunctionARNRequest = null, FunctionARNResponse = null, region = 'us-east-1') => {
     const client = createClient(CloudFrontClient, account, region);
 
     let OAI = await Spinner.prototype.simple(`Creating CloudFront OAI`, () => {
@@ -24,49 +26,7 @@ module.exports.createCloudFrontDistribution = async (name, account, tags = [], F
             return client.send(
                 new CreateDistributionWithTagsCommand({
                     DistributionConfigWithTags: {
-                        DistributionConfig: { 
-                            Enabled: true,
-                            CallerReference: name,
-                            Comment: `lab-env provisioned CloudFront distribution for project ${name}`,
-                            CustomErrorResponses: {
-                                Items: [
-                                    {
-                                        ErrorCachingMinTTL: 0,
-                                        ErrorCode: 404,
-                                        ResponseCode: 200,
-                                        ResponsePagePath: '/index.html'
-                                    }
-                                ],
-                                Quantity: 1
-                            },
-                            DefaultCacheBehavior: { 
-                                Compress: true,
-                                TargetOriginId: `${name}.s3.${region}.amazonaws.com`,
-                                ViewerProtocolPolicy: 'redirect-to-https',
-                                CachePolicyId: '658327ea-f89d-4fab-a63d-7e88639e58f6', // Built in, Managed AWS Policy - Cache Optimized
-                                FunctionAssociations: FunctionARN && {
-                                    Items: [
-                                        {
-                                            EventType: 'viewer-request',
-                                            FunctionARN
-                                        }
-                                    ],
-                                    Quantity: 1
-                                }
-                            },
-                            Origins: {
-                                Items: [
-                                    {
-                                        DomainName: `${name}.s3.${region}.amazonaws.com`,
-                                        Id: `${name}.s3.${region}.amazonaws.com`,
-                                        S3OriginConfig: {
-                                            OriginAccessIdentity: `origin-access-identity/cloudfront/${OAI.CloudFrontOriginAccessIdentity.Id}`
-                                        }
-                                    }
-                                ],
-                                Quantity: 1
-                            }
-                        },
+                        ...cloudfront(name, region, FunctionARNResponse, FunctionARNRequest, OAI),
                         Tags: {
                             Items: [{Key: 'client', Value: account}].concat(tags)
                         }
@@ -86,6 +46,18 @@ module.exports.createCloudFrontDistribution = async (name, account, tags = [], F
                 new GetDistributionCommand({ Id })
             );
         });
+
+        res = await Spinner.prototype.simple(`Ensuring CloudFront functions are applied to CloudFront distribution`, () => {
+            return client.send(
+                new UpdateDistributionCommand({ 
+                    ...merge(
+                        res.Distribution,
+                        cloudfront(name, region, FunctionARNResponse, FunctionARNRequest, OAI)
+                    ),
+                    IfMatch: res.ETag
+                })
+            );
+        });
     }
     
     return res;

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

@@ -17,7 +17,7 @@ module.exports.createElasticBeanstalkApplication = async (name, account) => {
     return res;
 }
 
-module.exports.createElasticBeanstalkEnvironment = async (name, account, ApplicationName, OptionSettings, CNAMEPrefix, tags = []) => {
+module.exports.createElasticBeanstalkEnvironment = async (name, account, {language}, ApplicationName, OptionSettings, CNAMEPrefix, tags = []) => {
     const client = createClient(ElasticBeanstalkClient, account);
 
     const solutions = await Spinner.prototype.simple(`Retrieving available solution stacks`, () => {
@@ -31,7 +31,9 @@ module.exports.createElasticBeanstalkEnvironment = async (name, account, Applica
             new CreateEnvironmentCommand({
                 ApplicationName,
                 EnvironmentName: name,
-                SolutionStackName: solutions.SolutionStacks.filter(d => d.includes('PHP 8.1') && d.includes('Amazon Linux 2 '))[0],
+                SolutionStackName: solutions.SolutionStacks.filter(d => {
+                    return language === "node" ? d.includes('Node.js 20') : d.includes('PHP 8.1') && d.includes('Amazon Linux 2 ') 
+                })[0],
                 OptionSettings,
                 CNAMEPrefix,
                 Tags: [{Key: 'client', Value: account}].concat(tags)

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

@@ -12,14 +12,30 @@ 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', 'alexion', 'insulet', 'danone'];
+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', 'insulet', 'danone', 'mtpa'];
 
-module.exports.static = async (name, account, tags = [], credentials = []) => {
+module.exports.static = async (name, account, tags = [], credentials = [], repo, branch) => {
     let s3 = await module.exports.s3.createS3Bucket(name, account, tags);
 
-    let cloudfrontFunction = await module.exports.cloudfront.createCloudFrontFunction(name, account, credentials.length ? 'aws-cloudfront-auth' : 'aws-cloudfront-simple', {credentials: credentials.map(d => `Basic ${Buffer.from(`${d.username}:${d.password}`).toString('base64')}`)});
-
-    let cloudfront = await module.exports.cloudfront.createCloudFrontDistribution(name, account, tags, cloudfrontFunction.FunctionSummary.FunctionMetadata.FunctionARN);
+    let cloudfront = await module.exports.cloudfront.createCloudFrontDistribution(
+        name,
+        account,
+        tags,
+        (await module.exports.cloudfront.createCloudFrontFunction(
+            name,
+            account,
+            credentials.length ? 'aws-cloudfront-auth' : 'aws-cloudfront-simple',
+            {
+                credentials: credentials.map(d => `Basic ${Buffer.from(`${d.username}:${d.password}`).toString('base64')}`)
+            }
+        )).FunctionSummary.FunctionMetadata.FunctionARN,
+        (await module.exports.cloudfront.createCloudFrontFunction(
+            module.exports.slug(`${repo}-response`, account, branch),
+            account,
+            'aws-cloudfront-response',
+            {}
+        )).FunctionSummary.FunctionMetadata.FunctionARN
+    );
 
     await module.exports.s3.setS3BucketPolicy(name, account, cloudfront.Distribution.DistributionConfig.Origins.Items[0].S3OriginConfig.OriginAccessIdentity.split('origin-access-identity/cloudfront/')[1]);
 
@@ -40,6 +56,8 @@ module.exports.staticTerminate = async (name, account, repo, branch, id) => {
     try { await module.exports.cloudfront.removeCloudFrontDistribution(id, account); } catch(e) {}
 
     try { await module.exports.cloudfront.removeCloudFrontFunction(name, account); } catch(e) {}
+    
+    try { await module.exports.cloudfront.removeCloudFrontFunction(module.exports.slug(`${repo}-response`, account, branch), account); } catch(e) {}
 }
 
 module.exports.fullstack = async (name, account, tags = [], credentials = [], repo, branch, framework, availability) => {
@@ -75,7 +93,7 @@ module.exports.fullstack = async (name, account, tags = [], credentials = [], re
         });
     }
 
-    const environment = await module.exports.elasticbeanstalk.createElasticBeanstalkEnvironment(name, account, repo, OptionSettings, CNAMEPrefix, tags);
+    const environment = await module.exports.elasticbeanstalk.createElasticBeanstalkEnvironment(name, account, {framework, availability, platform, language}, repo, OptionSettings, CNAMEPrefix, tags);
 
     const configurations = eb.merge("configurations", {framework, availability, platform, language});
 

package/commands/create/services/bitbucket.js

@@ -89,4 +89,21 @@ module.exports.fork = async (slug, template) => {
 
         return false;
     }
+};
+
+module.exports.enablePipelines = async (slug, config) => {
+    let spinner = new Spinner(`Enabling pipelines for ${slug}`);
+
+    try {
+        await api(headers.bbHeaders).put(`${apis.bbWorkspaceAPI}/${slug}/pipelines_config`, {
+            enabled: true
+        });
+
+        spinner.update(`Pipelines enabled for ${slug}`);
+
+        return true;
+    } catch (error) {        
+        console.log(error.message);
+        spinner.update(`Failed to enable pipelines for ${slug}.`, 'fail');
+    }
 };

package/commands/create/services/egnyte.js

@@ -3,14 +3,8 @@ const { ftppass, creds } = require('../libs/vars');
 const { exec } = require("child_process");
 
 module.exports.check = async () => {
-    try {
-        await module.exports.request(creds.egnyte.username, creds.egnyte.password, creds.egnyte.host);
+    return await module.exports.request(creds.egnyte.username, creds.egnyte.password, creds.egnyte.host) &&
         await module.exports.request(ftppass['ftp-fishawack.egnyte.com'].username, ftppass['ftp-fishawack.egnyte.com'].password, 'ftp-fishawack.egnyte.com');
-        
-        return true;
-    } catch(error) {
-        return false;
-    }
 };
 
 module.exports.request = async (username, password, host) => {

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

@@ -0,0 +1,6 @@
+container_commands:
+  10-db-import:
+    command: echo 'leader only'
+    leader_only: true
+  20-clear-cache:
+    command: ls

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

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

package/commands/create/templates/elasticbeanstalk/.ebextensions/httpd/auto-ssl.config

@@ -21,9 +21,9 @@ commands:
     
 container_commands:
   10_downloadepel: 
-    command: "wget -r --no-parent -A 'epel-release-*.rpm' https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/"
+    command: "wget -r --no-parent -A 'epel-release-*.rpm' https://dl.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/"
   20_installepel: 
-    command: "rpm -Uvh dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/epel-release-*.rpm --force"
+    command: "rpm -Uvh dl.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-*.rpm --force"
   30_enableepl: 
     command: "yum-config-manager --enable epel*"
   40_installcertbot: 

package/commands/create/templates/elasticbeanstalk/.ebextensions/nginx/auto-ssl.config

@@ -21,9 +21,9 @@ commands:
 
 container_commands:
   10_downloadepel: 
-    command: "wget -r --no-parent -A 'epel-release-*.rpm' https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/"
+    command: "wget -r --no-parent -A 'epel-release-*.rpm' https://dl.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/"
   20_installepel: 
-    command: "rpm -Uvh dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/epel-release-*.rpm --force"
+    command: "rpm -Uvh dl.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-*.rpm --force"
   30_enableepl: 
     command: "yum-config-manager --enable epel*"
   40_installcertbot: 

package/laravel/9/docker-compose.yml

@@ -56,6 +56,7 @@ services:
       - "${PORT_ES:-9200}:9200"
     volumes:
       - elasticsearch:/usr/share/elasticsearch/data
+    mem_limit: 2G
 networks:
   default:
     driver: "bridge"

package/package.json

@@ -1,13 +1,10 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "4.33.3",
+  "version": "4.35.0",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {
-    "test": "rm -rf _Test/_fixtures/boilerplate*; CI_BUILD_ID=true mocha _Test/*.js --timeout 12000s --bail",
-    "preversion": "npm test",
-    "postversion": "git push && git push --tags && npm publish",
-    "postpublish": "git checkout development && git merge master && git push"
+    "test": "rm -rf _Test/_fixtures/boilerplate*; CI_BUILD_ID=true mocha _Test/*.js --timeout 12000s --bail"
   },
   "repository": {
     "type": "git",
@@ -51,5 +48,36 @@
   "engines": {
     "npm": ">=8",
     "node": ">=18"
+  },
+  "release": {
+    "plugins": [
+      [
+        "@semantic-release/commit-analyzer",
+        {
+          "preset": "conventionalcommits"
+        }
+      ],
+      [
+        "@semantic-release/release-notes-generator",
+        {
+          "preset": "conventionalcommits",
+          "writerOpts": {
+            "headerPartial": "### {{version}} ({{date}})\n",
+            "mainTemplate": "{{> header}}\n{{#each commitGroups}}\n\n{{#if title}}\n#### {{title}}\n\n{{/if}}\n{{#each commits}}\n{{> commit root=@root}}\n{{/each}}\n{{/each}}"
+          },
+          "presetConfig": {
+            "commitUrlFormat": "{{host}}/{{owner}}/{{repository}}/commits/{{hash}}"
+          }
+        }
+      ],
+      [
+        "@semantic-release/changelog",
+        {
+          "changelogTitle": "## Changelog"
+        }
+      ],
+      "@semantic-release/npm",
+      "@semantic-release/git"
+    ]
   }
 }

package/.gitlab-ci.yml

@@ -1,26 +0,0 @@
-stages:
-  - test
-
-test:
-  stage: test
-  resource_group: test
-  coverage: '/Code coverage: \d+\.\d+/'
-  variables:
-    FW_FULL: 1
-  before_script:
-    # Remove all projects currently on runner
-    - find "/home/gitlab-runner/builds/" ! \( -type d \) -not -path "/*/0/${CI_PROJECT_PATH}/*" -not -path "/*/0/${CI_PROJECT_PATH}.tmp/*" -exec rm -rf {} + 
-    # Remove all empty files now the folders are cleaned out
-    - find "/home/gitlab-runner/builds/" -type d -empty -delete
-  script: 
-    # Install
-    - npm ci
-    # # Test
-    - npm test
-  after_script:
-    # Clean docker
-    - docker volume rm $(docker volume ls -q) || true
-  artifacts:
-    expire_in: 2 hrs
-    paths:
-      - coverage/