@fishawack/lab-env 4.45.1 → 4.46.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 ## Changelog
 
+### 4.46.0-beta.2 (2025-09-12)
+
+#### Features
+
+* added python settings ([5cacbb5](https://bitbucket.org/fishawackdigital/lab-env/commits/5cacbb56d7b7fb052959baad8e90cd98cac07c39))
+* python deployments ([02f3293](https://bitbucket.org/fishawackdigital/lab-env/commits/02f32934c362826ed1e10f3609dd0eaac87a4f75))
+* python now uses its own port as core also needed alongside python now ([c38c8f9](https://bitbucket.org/fishawackdigital/lab-env/commits/c38c8f962d024854c0764dcca88c26e7a808c122))
+
+#### Bug Fixes
+
+* dont stop package and mail commands on python projects ([6267142](https://bitbucket.org/fishawackdigital/lab-env/commits/62671425796c8ce03edfbdb71e50ca4676fd4eeb))
+
+#### Build Updates
+
+* bumped to latest bitbucket-ci config ([fcb22d8](https://bitbucket.org/fishawackdigital/lab-env/commits/fcb22d8ff7e99ce95e8bf3868b6dcf7192823bfd))
+* use bitbucket beta exported beta and master config with post relase ([9ad0317](https://bitbucket.org/fishawackdigital/lab-env/commits/9ad0317e5c5a89640149412519b5e94491a48e92))
+
+### 4.46.0-beta.1 (2025-09-05)
+
+#### Features
+
+* write vscode workspace settings for python ([c6b2c4d](https://bitbucket.org/fishawackdigital/lab-env/commits/c6b2c4df1d730c054b966582119765d519e8f644))
+
+#### Bug Fixes
+
+* start now always ups whatever containers are configured ([eae144b](https://bitbucket.org/fishawackdigital/lab-env/commits/eae144be3d7f4ff2d0e39368a60c3eb280567b0c))
+* use extrapaths to stop python warnings ([594887d](https://bitbucket.org/fishawackdigital/lab-env/commits/594887df096a4c46abbe47e0f2363bcc2bc28181))
+
 ### 4.45.1 (2025-09-04)
 
 #### Bug Fixes

package/_Scripts/post-release.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# Commit and create pull request for new version on aws-runner repo
+git config --global user.email "digital@fishawack.com"
+
+git config --global user.name "Digital Fishawack"
+
+git clone https://$GIT_CREDENTIALS@bitbucket.org/fishawackdigital/aws-runner
+
+cd aws-runner
+
+git checkout -b "$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT" origin/development
+
+sed -i -e "s/\(@fishawack\/lab-env@\).*/\1$(jq -r '.version' ../package.json)/g" Dockerfile
+
+git add .
+
+git commit -m "build($BITBUCKET_REPO_SLUG): Bumped $BITBUCKET_REPO_SLUG"
+
+git push origin "$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT"
+
+curl https://api.bitbucket.org/2.0/repositories/fishawackdigital/aws-runner/pullrequests \
+    -u $GIT_CREDENTIALS \
+    --header 'Content-Type: application/json' \
+    --data "{
+        \"title\": \"Bumped $BITBUCKET_REPO_SLUG\",
+        \"destination\": {
+        \"branch\": {
+            \"name\": \"development\"
+        }
+        },
+        \"source\": {
+        \"branch\": {
+            \"name\": \"$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT\"
+        }
+        },
+        \"reviewers\": [
+            {
+                \"uuid\": \"{2518e4c3-fc1d-4653-b355-c00be099ce6c}\"
+            }
+        ],
+        \"close_source_branch\": true
+    }"

package/bitbucket-pipelines.yml

@@ -46,91 +46,6 @@ pipelines:
           - docker
   branches:
     master:
-      - step:
-          image: fishawack/aws-runner
-          runs-on:
-            - self.hosted
-            - linux
-            - production
-          size: 4x
-          script:
-            # Install lib deps
-            - git submodule init && git submodule update
-            # Install release deps
-            - npm install -g semantic-release@24 @semantic-release/changelog@6 @semantic-release/git@10 conventional-changelog-conventionalcommits@8
-            # Release version via node so can exit out when no release made
-            - |
-              node -e "const spawn = require('child_process').spawn('semantic-release', ['--repositoryUrl', 'https://$GIT_CREDENTIALS@bitbucket.org/$BITBUCKET_REPO_FULL_NAME'], { env: { ...process.env, FORCE_COLOR: true } }); spawn.stderr.on('data', d => process.stderr.write(d.toString())); spawn.stdout.on('data', d => {process.stdout.write(d.toString()); if(d.toString().includes('There are no relevant changes, so no new version is released.') || d.toString().includes('therefore a new version won\'t be published.')){process.exit(1);}})" || exit 0
-            # Open PR to re-sync beta after release
-            - |
-              curl https://api.bitbucket.org/2.0/repositories/${BITBUCKET_REPO_OWNER}/${BITBUCKET_REPO_SLUG}/pullrequests \
-                -u $GIT_CREDENTIALS \
-                --header 'Content-Type: application/json' \
-                --data "{
-                  \"title\": \"fw-auto: sync beta after release\",
-                  \"source\": {
-                    \"branch\": {
-                      \"name\": \"master\"
-                    }
-                  },
-                  \"destination\": {
-                    \"branch\": {
-                      \"name\": \"beta\"
-                    }
-                  },
-                  \"reviewers\": [
-                      {
-                          \"uuid\": \"{2518e4c3-fc1d-4653-b355-c00be099ce6c}\"
-                      }
-                  ]
-                }"
-            # Commit and create pull request for new version on aws-runner repo
-            - git config --global user.email "digital@fishawack.com"
-            - git config --global user.name "Digital Fishawack"
-            - git clone https://$GIT_CREDENTIALS@bitbucket.org/fishawackdigital/aws-runner
-            - cd aws-runner
-            - git checkout -b "$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT" origin/development
-            - sed -i -e "s/\(@fishawack\/lab-env@\).*/\1$(jq -r '.version' ../package.json)/g" Dockerfile
-            - git add .
-            - |
-              git commit -m "build($BITBUCKET_REPO_SLUG): Bumped $BITBUCKET_REPO_SLUG"
-            - git push origin "$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT"
-            - |
-              curl https://api.bitbucket.org/2.0/repositories/fishawackdigital/aws-runner/pullrequests \
-                -u $GIT_CREDENTIALS \
-                --header 'Content-Type: application/json' \
-                --data "{
-                  \"title\": \"Bumped $BITBUCKET_REPO_SLUG\",
-                  \"destination\": {
-                    \"branch\": {
-                      \"name\": \"development\"
-                    }
-                  },
-                  \"source\": {
-                    \"branch\": {
-                      \"name\": \"$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT\"
-                    }
-                  },
-                  \"reviewers\": [
-                      {
-                          \"uuid\": \"{2518e4c3-fc1d-4653-b355-c00be099ce6c}\"
-                      }
-                  ],
-                  \"close_source_branch\": true
-                }"
+      import: bitbucket-ci:v2.2.0-beta.4:master
     beta:
-      - step:
-          image: fishawack/aws-runner
-          runs-on:
-            - self.hosted
-            - linux
-            - production
-          size: 4x
-          script:
-            # Install lib deps
-            - git submodule init && git submodule update
-            # Install release deps
-            - npm install -g semantic-release@24 @semantic-release/changelog@6 @semantic-release/git@10 conventional-changelog-conventionalcommits@8
-            # Release version via node so can exit out when no release made
-            - |
-              node -e "const spawn = require('child_process').spawn('semantic-release', ['--repositoryUrl', 'https://$GIT_CREDENTIALS@bitbucket.org/$BITBUCKET_REPO_FULL_NAME'], { env: { ...process.env, FORCE_COLOR: true } }); spawn.stderr.on('data', d => process.stderr.write(d.toString())); spawn.stdout.on('data', d => {process.stdout.write(d.toString()); if(d.toString().includes('There are no relevant changes, so no new version is released.') || d.toString().includes('therefore a new version won\'t be published.')){process.exit(1);}})" || exit 0
+      import: bitbucket-ci:v2.2.0-beta.4:beta

package/cli.js

@@ -47,13 +47,13 @@ const args = hideBin(process.argv);
                 "nuke",
                 "lint",
                 "workspace",
+                "npm",
             ],
 
             // Web development commands (for frameworks that build frontend assets)
             webDev: [
                 "watch",
                 "check",
-                "npm",
                 "reinstall",
                 "install",
                 "uninstall",

package/commands/create/libs/vars.js

@@ -180,11 +180,51 @@ module.exports.frameworks = [
         name: "adonis",
         value: "adonis",
     },
+    {
+        name: "python",
+        value: "python",
+    },
 ];
 
 // Elasticbeanstlak configs based on preconfigurations
 module.exports.eb = {
     environments: {
+        python: {
+            shared: [],
+            low: [],
+            high: [
+                {
+                    OptionName: "ELBScheme",
+                    Value: "internal",
+                    Namespace: "aws:ec2:vpc",
+                },
+                {
+                    OptionName: "VPCId",
+                    Value: "vpc-d30bcca8",
+                    Namespace: "aws:ec2:vpc",
+                },
+                {
+                    OptionName: "Subnets",
+                    Value: "subnet-00bf5eda896fdd5c5,subnet-0aa7e40d4701683ae",
+                    Namespace: "aws:ec2:vpc",
+                },
+                {
+                    OptionName: "ELBSubnets",
+                    Value: "subnet-00bf5eda896fdd5c5,subnet-0aa7e40d4701683ae",
+                    Namespace: "aws:ec2:vpc",
+                },
+                {
+                    OptionName: "AssociatePublicIpAddress",
+                    Value: "false",
+                    Namespace: "aws:ec2:vpc",
+                },
+                {
+                    OptionName: "APP_ENV",
+                    Value: "production",
+                    Namespace: "aws:elasticbeanstalk:application:environment",
+                },
+            ],
+        },
         php: {
             shared: [],
             low: [],
@@ -618,6 +658,13 @@ module.exports.eb = {
             low: [],
             high: [],
         },
+        python: {
+            platform: "nginx",
+            language: "python",
+            shared: [],
+            low: [],
+            high: [],
+        },
         shared: [".ebextensions/misc/setvars.config"],
         low: [".ebextensions/misc/enable-https.config"],
         high: [

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

@@ -46,6 +46,20 @@ module.exports.createElasticBeanstalkEnvironment = async (
         },
     );
 
+    let stackName = "PHP 8.2";
+    switch (language) {
+        case "python":
+            stackName = "Python 3.13";
+            break;
+        case "node":
+            stackName = "Node.js 20";
+            break;
+    }
+
+    const SolutionStackName = solutions.SolutionStacks.filter((d) =>
+        d.includes(stackName),
+    )[0];
+
     await Spinner.prototype.simple(
         `Creating elasticbeanstalk environment ${name}`,
         () => {
@@ -53,12 +67,7 @@ module.exports.createElasticBeanstalkEnvironment = async (
                 new CreateEnvironmentCommand({
                     ApplicationName,
                     EnvironmentName: name,
-                    SolutionStackName: solutions.SolutionStacks.filter((d) => {
-                        return language === "node"
-                            ? d.includes("Node.js 20")
-                            : d.includes("PHP 8.2") &&
-                                  d.includes("Amazon Linux 2023");
-                    })[0],
+                    SolutionStackName,
                     OptionSettings,
                     CNAMEPrefix,
                     Tags: [{ Key: "client", Value: account }].concat(tags),

package/commands/run.js

@@ -24,13 +24,6 @@ module.exports = [
     },
     (argv) => {
         if (_.platform === "python") {
-            if (argv.command === "mail" || argv.command === "package") {
-                console.log(
-                    `${argv.command} is a built-in command and will be ignored`,
-                );
-                return;
-            }
-
             const command = argv.command.endsWith(".py")
                 ? argv.command
                 : `${argv.command}.py`;

package/commands/start.js

@@ -15,22 +15,16 @@ module.exports = [
         const command = () =>
             _.command("core", `npm start -- -- ${argv.flags.join(" ")}`, true);
 
-        if (
-            _.platform === "laravel" ||
-            _.platform === "wordpress" ||
-            _.platform === "drupal" ||
-            _.platform === "craftcms" ||
-            _.platform === "adonis"
-        ) {
-            _.up(command);
-        } else if (_.platform === "python") {
-            _.command(
-                "python",
-                `uv run ./src/main.py -- -- ${argv.flags.join(" ")}`,
-                true,
-            );
-        } else {
-            command();
-        }
+        _.up(() => {
+            if (_.platform === "python") {
+                _.command(
+                    "python",
+                    `uv run ./src/main.py -- -- ${argv.flags.join(" ")}`,
+                    true,
+                );
+            } else {
+                command();
+            }
+        });
     },
 ];

package/globals.js

@@ -8,6 +8,7 @@ const {
     copyFileSync,
     existsSync,
     readFileSync,
+    writeFileSync,
     cpSync,
     mkdirSync,
 } = require("fs");
@@ -126,6 +127,7 @@ var exec;
 var running;
 var services;
 var branch;
+let vscodeSettings = {};
 var diagnosis = "4.0.0";
 var opts = { encoding: "utf8", stdio: "inherit", shell: "/bin/bash" };
 const users = {
@@ -280,6 +282,10 @@ if (composer && composer.require && composer.require["laravel/framework"]) {
     platform = "php";
 } else if (python) {
     platform = "python";
+
+    vscodeSettings["python.analysis.extraPaths"] = [
+        "${workspaceFolder}/.venv/lib/python3.13/site-packages",
+    ];
 } else {
     // Check for old wordpress repo stucture and show warning
     try {
@@ -613,6 +619,18 @@ if (version) {
     copyAIInstructionsFile("webdriverio-capture-v9");
 }
 
+// Create .vscode/settings.json if it doesn't exist
+const vscodeDir = path.join(cwd, ".vscode");
+const vscodeSettingsPath = path.join(vscodeDir, "settings.json");
+
+if (!existsSync(vscodeSettingsPath) && Object.keys(vscodeSettings).length) {
+    if (!existsSync(vscodeDir)) {
+        mkdirSync(vscodeDir, { recursive: true });
+    }
+
+    writeFileSync(vscodeSettingsPath, JSON.stringify(vscodeSettings, null, 4));
+}
+
 // If docker-compose.yml exists in project _Docker folder append to end
 let localOverride = "";
 if (existsSync(path.join(cwd, "_Docker/docker-compose.yml"))) {
@@ -636,7 +654,7 @@ if (platform === "laravel") {
 } else if (platform === "php") {
     docker = `docker compose --env-file ${path.join(cwd, ".env")} -f ${__dirname}/php/8.2/docker-compose.yml ${localOverride} -p ${repoSafe}`;
 } else if (platform === "python") {
-    docker = `docker compose -f ${__dirname}/python/0/docker-compose.yml ${localOverride} -p ${repoSafe}`;
+    docker = `docker compose -f ${__dirname}/python/0/docker-compose.yml ${core} ${localOverride} -p ${repoSafe}`;
 } else {
     docker = `docker compose ${core} ${localOverride} -p ${repoSafe}`;
 }
@@ -770,6 +788,12 @@ module.exports = {
                         port: getPort.makeRange(9200, 9300),
                     });
                 }
+
+                if (platform === "python") {
+                    process.env.PORT_PY = await getPort({
+                        port: getPort.makeRange(8101, 8200),
+                    });
+                }
             }
         },
         get() {
@@ -782,6 +806,8 @@ module.exports = {
                     ports.db = { port: +process.env.PORT_DB };
                 if (+process.env.PORT_ES)
                     ports.es = { port: +process.env.PORT_ES };
+                if (+process.env.PORT_PY)
+                    ports.es = { port: +process.env.PORT_PY };
 
                 console.table(ports);
             }

package/package.json

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

package/python/0/docker-compose.yml

@@ -13,11 +13,11 @@ services:
       - PYTHONDONTWRITEBYTECODE="1"
       - PYTHONUNBUFFERED="1"
       - REPO=${REPO:-}
-      - PORT=${PORT:-3000}
+      - PORT_PY=${PORT_PY:-8000}
       - USER_UID=${USER_UID:-0}
       - USER_GID=${USER_GID:-0}
     ports:
-      - ${PORT:-3000}:${PORT:-3000}
+      - ${PORT_PY:-8000}:${PORT_PY:-8000}
     volumes:
       - $CWD/:/workspace
 networks:

package/core/1/CHANGELOG.md

@@ -1,136 +0,0 @@
-## Changelog
-
-### 1.8.0 (2025-08-10)
-
-#### Features
-
-* new env flag for remote browsers ([f313be6](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/f313be6cde14e05ac832b43127b6c5639fd62015))
-
-### 1.8.0-beta.1 (2025-08-10)
-
-#### Features
-
-* new env flag for remote browsers ([f313be6](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/f313be6cde14e05ac832b43127b6c5639fd62015))
-
-### 1.7.2 (2025-05-15)
-
-#### Bug Fixes
-
-* use n flag in symlink to override if symlink already exists ([cdc1a41](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/cdc1a41639785f65e2076477f33e86a8ea8cb8fa))
-
-### 1.7.2-beta.1 (2025-05-15)
-
-#### Bug Fixes
-
-* use n flag in symlink to override if symlink already exists ([cdc1a41](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/cdc1a41639785f65e2076477f33e86a8ea8cb8fa))
-
-### 1.7.1 (2025-05-15)
-
-#### Reverts
-
-* Revert "feat: installed husky npm module globally" ([91cc456](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/91cc4564ea2fd6650924732a2a75cb4a9fb749b5))
-
-### 1.7.1-beta.1 (2025-05-14)
-
-#### Reverts
-
-* Revert "feat: installed husky npm module globally" ([91cc456](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/91cc4564ea2fd6650924732a2a75cb4a9fb749b5))
-
-### 1.7.0 (2025-05-14)
-
-#### Features
-
-* installed husky npm module globally ([e08f5a7](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/e08f5a7850d0743137c26addf694f586c8c8ee74))
-* updated node from 20 to 22 ([e592f6e](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/e592f6e93fc6554227f8902c8c1c21a3564a32ce))
-
-### 1.7.0-beta.1 (2025-05-14)
-
-#### Features
-
-* installed husky npm module globally ([e08f5a7](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/e08f5a7850d0743137c26addf694f586c8c8ee74))
-* updated node from 20 to 22 ([e592f6e](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/e592f6e93fc6554227f8902c8c1c21a3564a32ce))
-
-### 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
-
-* rclone in alpine image and aws sdk back in full image as rclone used for s3 content ([9e68463](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/9e684631bb83c105aa9e5407e8fee30a788309cd))
-
-### 1.5.1 (2024-10-07)
-
-#### Bug Fixes
-
-* move aws from full image to alpine now that s3 content requests are supported ([a947817](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/a94781756ea482545b63018e72ab30ce25727af9))
-
-### 1.5.0 (2024-10-01)
-
-#### Features
-
-* commit into lab-env and create pull request against development on publish ([22e9c66](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/22e9c666dff1e6453090da472a6cd4f0b89c6fbb))
-
-#### Bug Fixes
-
-* close source branch by default on pull request ([5208373](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/5208373822272c648a547f9b328720cb4fdf9bd4))
-
-### 1.4.2 (2024-10-01)
-
-#### Bug Fixes
-
-* trigger ci ([301d679](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/301d6795162f0bf8941a3b9413a30092a3e8bf21))
-
-### 1.4.1 (2024-07-17)
-* [fix] set global var for git across file system so git avail in mounted volumes i.e node_modules
-
-### 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
-
-### 1.3.2 (2024-01-24)
-* [fix] install latest eb cli and use node images python rather than pyenv
-
-### 1.3.1 (2024-01-22)
-* [fix] rebuild of image to get the latest chromium version to fix new puppeteer headless mode
-
-### 1.3.0 (2023-03-17)
-* [feat] node user is now added to www-data group for easier file permission management
-* [fix] disable npm message about update being available
-
-### 1.2.2 (2023-02-25)
-* [fix] set BRANCH and CI_COMMIT_REF_NAME env variables in container
-* [fix] installed git-branch to fetch the current branch for deployment targets
-* [refactor] moved global node module symlinking to alpine image for future use
-
-### 1.2.1 (2023-02-25)
-* [fix] install eb cli into root of image rather than root user directory
-* [perf] dont recurse and dont change group of node_modules to speed up command
-* [refactor] set node git flag without switching user directly in dockerfile
-
-### 1.1.4 (2023-02-23)
-* [Fix] Installed missing are-you-es5 global npm module
-* [Fix] Installed missing check-dependencies global npm module
-
-### 1.1.3 (2023-02-23)
-* [Fix] Switch to ENV for $PATH updates to avoid shell profile loading issues
-* [Fix] Moved chromium to alpine image as its needed for svg tasks and testing
-
-### 1.1.2 (2023-02-22)
-* [Fix] cd into $PWD after su command or we'll start in users home directory
-
-### 1.1.1 (2023-02-22)
-* [Fix] Use -l login flag for su command for both non interactive and interactive shells
-* [Fix] Switch $PATH writes to .profile so they are executed on non interactive shells
-
-### 1.1.0 (2023-02-22)
-* [Feature] Watertight now baked into image so not needed in package.json of projects
-* [Fix] lftp installed in alpine image as it's needed for content tasks
-
-### 1.0.0 (2023-02-21)
-* [Misc] initial commit

package/core/1/Dockerfile

@@ -1,113 +0,0 @@
-#####
-# Alpine image
-#####
-
-FROM node:22 AS alpine
-
-LABEL org.opencontainers.image.authors="Mike Mellor <mike.mellor@avalerehealth.com>"
-
-ARG TARGETARCH
-
-WORKDIR /app
-
-EXPOSE 3000
-EXPOSE 3001
-
-# Get latest apt-get
-RUN apt-get update
-
-# Update npm to latest
-RUN npm install -g npm@latest
-
-# Install dart sass vm (arch switch)
-RUN curl -L -o /sass.tar.gz https://github.com/sass/dart-sass/releases/download/1.57.1/dart-sass-1.57.1-linux-$(if [ "$TARGETARCH" = "arm64" ]; then echo 'arm64'; else echo 'x64'; fi).tar.gz
-RUN tar -xf /sass.tar.gz -C /
-ENV PATH="${PATH}:/dart-sass/"
-RUN rm -rf /sass.tar.gz
-
-# Set safe directory to remove intel errors when running git rev-parse
-RUN su node -c "git config --global --add safe.directory /app"
-
-# Also set global git flag for allowing access across filesystems for mounted node_modules dir
-ENV GIT_DISCOVERY_ACROSS_FILESYSTEM=1
-
-# Disable npm message about updates being available
-RUN su node -c "npm config set update-notifier false"
-
-# Add node user to www-data group
-RUN usermod -a -G www-data node
-
-# Install lftp
-RUN apt-get install -y lftp
-
-# Install chromium
-RUN apt-get install -y chromium fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 --no-install-recommends
-# Stop Puppeteer downloading browsers during npm install
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
-ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
-
-# Install package.json checker
-RUN npm install check-dependencies -g
-
-# Install node_modules checker
-RUN npm install are-you-es5 -g
-
-# Install git branch fetcher
-RUN npm install git-branch -g
-
-# Link root global node_modules to ~/.node_modules
-RUN ln -s /usr/local/lib/node_modules/ /home/node/.node_modules
-
-# Install rclone
-RUN curl https://rclone.org/install.sh | bash
-
-# Cleanup apt-get install folders
-RUN apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-COPY entrypoint.sh /bin/entrypoint.sh
-RUN chmod +x /bin/entrypoint.sh
-ENTRYPOINT ["/bin/entrypoint.sh"]
-
-#####
-# Full image
-#####
-
-FROM alpine AS full
-
-# Get latest apt-get
-RUN apt-get update
-
-# Install ghostscript
-RUN apt-get install -y ghostscript
-
-# Install zip
-RUN apt-get install zip
-
-# Install AWS Elastic Beanstalk cli
-ENV PATH="${PATH}:/.ebcli-virtual-env/executables"
-RUN apt-get -y install python-is-python3 python3-pip && \
-    pip install virtualenv --break-system-packages && \
-    git clone https://github.com/aws/aws-elastic-beanstalk-cli-setup.git ~/aws-eb && \
-    python ~/aws-eb/scripts/ebcli_installer.py --location / && \
-    rm -rf ~/aws-eb
-
-# Install AWS-CLI@2 (arch switch)
-RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(if [ "$TARGETARCH" = "arm64" ]; then echo 'aarch64'; else echo 'x86_64'; fi).zip" -o "awscliv2.zip"
-RUN unzip awscliv2.zip
-RUN ./aws/install
-RUN rm -rf ./aws && rm -rf awscliv2.zip
-
-# Update electron globally
-RUN npm install -g electron-packager@latest
-
-# Install wine64
-RUN apt-get install -y wine64 && \
-    ln -s /usr/bin/wine /usr/bin/wine64
-
-# Install watertight
-RUN --mount=type=ssh npm install -g git+ssh://git@bitbucket.org/fishawackdigital/watertight-node-auto.git#v6.0.0
-
-# Cleanup apt-get install folders
-RUN apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

package/core/1/README.md

@@ -1,9 +0,0 @@
-## Background
-
-### What
-
-The image used for core@8 and above.
-
-### Why
-
-Allows us to automate the local developer & CI environments.

package/core/1/bitbucket-pipelines.yml

@@ -1,82 +0,0 @@
-definitions:
-  services:
-    docker:
-      image: docker:dind
-      memory: 12288
-
-pipelines:
-  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 via node so can exit out when no release made
-            - |
-              node -e "const spawn = require('child_process').spawn('semantic-release', ['--repositoryUrl', 'https://$GIT_CREDENTIALS@bitbucket.org/$BITBUCKET_REPO_FULL_NAME'], { env: { ...process.env, FORCE_COLOR: true } }); spawn.stderr.on('data', d => process.stderr.write(d.toString())); spawn.stdout.on('data', d => {process.stdout.write(d.toString()); if(d.toString().includes('There are no relevant changes, so no new version is released.') || d.toString().includes('therefore a new version won\'t be published.')){process.exit(1);}})" || exit 0
-            # Copy ssh keys so physical files exist for agent to use
-            - cp /build/*/ssh/* ~/.ssh/
-            # Start ssh agent and add all (if any) keys
-            - eval `ssh-agent` && ssh-add || true
-            # Publish docker image
-            - docker login $DOCKER_CREDENTIALS && docker buildx create --use && npm run image
-            # Sync beta after publish
-            - git config --global user.email "digital@fishawack.com"
-            - git config --global user.name "Digital Fishawack"
-            - git fetch origin "+refs/heads/*:refs/remotes/origin/*" && git checkout beta && git merge master && git push origin beta
-            # Commit and create pull request for new version on lab-env repo
-            - git clone https://$GIT_CREDENTIALS@bitbucket.org/fishawackdigital/lab-env
-            - cd lab-env
-            - git checkout -b "$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT" origin/beta
-            - git submodule init
-            - git submodule update
-            - git submodule update --remote --merge core/1
-            - git add .
-            - |
-              git commit --allow-empty -m "build(core/1): Bumped $BITBUCKET_REPO_SLUG"
-            - git push origin "$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT"
-            - |
-              curl https://api.bitbucket.org/2.0/repositories/fishawackdigital/lab-env/pullrequests \
-                -u $GIT_CREDENTIALS \
-                --header 'Content-Type: application/json' \
-                --data "{
-                  \"title\": \"Bumped $BITBUCKET_REPO_SLUG\",
-                  \"destination\": {
-                    \"branch\": {
-                      \"name\": \"beta\"
-                    }
-                  },
-                  \"source\": {
-                    \"branch\": {
-                      \"name\": \"$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT\"
-                    }
-                  },
-                  \"reviewers\": [
-                      {
-                          \"uuid\": \"{2518e4c3-fc1d-4653-b355-c00be099ce6c}\"
-                      }
-                  ],
-                  \"close_source_branch\": true
-                }"
-          services:
-            - docker
-    beta:
-      - step:
-          image: fishawack/aws-runner
-          runs-on:
-            - self.hosted
-            - linux
-            - production
-          size: 4x
-          script:
-            # Install deps
-            - npm install -g semantic-release@24 @semantic-release/changelog@6 @semantic-release/git@10 conventional-changelog-conventionalcommits@8
-            # Release version via node so can exit out when no release made
-            - |
-              node -e "const spawn = require('child_process').spawn('semantic-release', ['--repositoryUrl', 'https://$GIT_CREDENTIALS@bitbucket.org/$BITBUCKET_REPO_FULL_NAME'], { env: { ...process.env, FORCE_COLOR: true } }); spawn.stderr.on('data', d => process.stderr.write(d.toString())); spawn.stdout.on('data', d => {process.stdout.write(d.toString()); if(d.toString().includes('There are no relevant changes, so no new version is released.') || d.toString().includes('therefore a new version won\'t be published.')){process.exit(1);}})" || exit 0

package/core/1/docker-compose.yml

@@ -1,37 +0,0 @@
-services:
-  core:
-    build:
-      context: $FW_CORE_1_CONTEXT
-      target: $FW_CORE_1_TARGET
-      ssh:
-        - default
-      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:
-      - $CWD/:/app
-      - $FW_DIR/targets:/home/node/targets
-      - $FW_DIR/.ssh:/home/node/.ssh
-      - $FW_DIR/.aws:/home/node/.aws
-      - node_modules:/app/node_modules
-    ports:
-      - ${PORT:-3000}:${PORT:-3000}
-      - ${PORT_OPT:-3001}:${PORT_OPT:-3001}
-    environment:
-      - REPO=${REPO:-}
-      - PORT=${PORT:-3000}
-      - PORT_OPT=${PORT_OPT:-3001}
-      - PORT_WEB=${PORT_WEB:-8000}
-      - PORT_DB=${PORT_DB:-3306}
-      - USER_UID=${USER_UID:-0}
-      - USER_GID=${USER_GID:-0}
-      - FW_ROOT=${FW_ROOT:-}
-      - BRANCH=${BRANCH:-}
-      - CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME:-}
-      - REMOTE_BROWSERS=${REMOTE_BROWSERS:-chrome}
-volumes:
-  node_modules:
-    driver: "local"

package/core/1/entrypoint.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# Setting $FW_ROOT will bypass the user switch to node
-if [ -z "$FW_ROOT" ]; then
-    # Set node user id to match host users id so no permission issues outside of docker
-    usermod -u $USER_UID node &>/dev/null
-
-    # 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
-    # Otherwise pipe the command after the bash -lc into the non login non interactive shell as a command to exec
-    else
-        exec su node -c "${@:3}"
-    fi
-else
-    echo "Accessing as root"
-    exec "$@"
-fi

package/core/1/package.json

@@ -1,47 +0,0 @@
-{
-    "name": "core",
-    "version": "1.8.0",
-    "description": "lab-env docker config for the @fishawack/core/1 npm module",
-    "scripts": {
-        "setup": "ln -sfn ../../.commitlintrc.json .commitlintrc.json && ln -sfn ../../.editorconfig .editorconfig && ln -sfn ../../.prettierignore .prettierignore && ln -sfn ../../.husky/ .husky && husky &>/dev/null || true",
-        "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 ."
-    },
-    "author": "Mike Mellor",
-    "license": "ISC",
-    "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",
-                {
-                    "npmPublish": false
-                }
-            ],
-            "@semantic-release/git"
-        ]
-    }
-}