@fishawack/lab-env 5.1.0 → 5.2.0-beta.2

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

@@ -62,23 +62,20 @@ module.exports.clients = [
 
 module.exports.static = async (
     name,
-    account,
     tags = [],
     credentials = [],
     repo,
     branch,
 ) => {
-    let s3 = await module.exports.s3.createS3Bucket(name, account, tags);
+    let s3 = await module.exports.s3.createS3Bucket(name, tags);
 
     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",
@@ -92,8 +89,11 @@ module.exports.static = async (
             ).FunctionSummary.FunctionMetadata.FunctionARN,
             (
                 await module.exports.cloudfront.createCloudFrontFunction(
-                    module.exports.slug(`${repo}-response`, account, branch),
-                    account,
+                    module.exports.slug(
+                        `${repo}-response`,
+                        process.env.AWS_PROFILE,
+                        branch,
+                    ),
                     "aws-cloudfront-response",
                     {},
                 )
@@ -102,7 +102,6 @@ module.exports.static = async (
 
     await module.exports.s3.setS3BucketPolicy(
         name,
-        account,
         cloudfront.Distribution.DistributionConfig.Origins.Items[0].S3OriginConfig.OriginAccessIdentity.split(
             "origin-access-identity/cloudfront/",
         )[1],
@@ -117,38 +116,34 @@ module.exports.static = async (
     return config;
 };
 
-module.exports.staticTerminate = async (name, account, repo, branch, id) => {
+module.exports.staticTerminate = async (name, repo, branch, id) => {
     try {
-        await module.exports.s3.emptyS3Bucket(name, account);
+        await module.exports.s3.emptyS3Bucket(name);
     } catch {
         /* empty */
     }
 
     try {
-        await module.exports.s3.removeS3Bucket(name, account);
+        await module.exports.s3.removeS3Bucket(name);
     } catch {
         /* empty */
     }
 
     try {
-        await module.exports.cloudfront.removeCloudFrontDistribution(
-            id,
-            account,
-        );
+        await module.exports.cloudfront.removeCloudFrontDistribution(id);
     } catch {
         /* empty */
     }
 
     try {
-        await module.exports.cloudfront.removeCloudFrontFunction(name, account);
+        await module.exports.cloudfront.removeCloudFrontFunction(name);
     } catch {
         /* empty */
     }
 
     try {
         await module.exports.cloudfront.removeCloudFrontFunction(
-            module.exports.slug(`${repo}-response`, account, branch),
-            account,
+            module.exports.slug(`${repo}-response`, branch),
         );
     } catch {
         /* empty */
@@ -157,43 +152,46 @@ module.exports.staticTerminate = async (name, account, repo, branch, id) => {
 
 module.exports.fullstack = async (
     name,
-    account,
     tags = [],
     credentials = [],
     repo,
     branch,
     framework,
     availability,
+    database = false,
 ) => {
     const { platform, language } = eb.configurations[framework];
 
-    const s3Slug = module.exports.slug(repo, account, branch, "s3");
+    const s3Slug = module.exports.slug(
+        repo,
+        process.env.AWS_PROFILE,
+        branch,
+        "s3",
+    );
 
-    await module.exports.iam.createIAMUser(s3Slug, account, tags);
+    await module.exports.iam.createIAMUser(s3Slug, tags);
     await module.exports.iam.attachIAMPolicy(
         s3Slug,
-        account,
         "arn:aws:iam::aws:policy/AmazonS3FullAccess",
     );
     const {
         AccessKey: { AccessKeyId },
         AccessKey: { SecretAccessKey },
-    } = await module.exports.iam.createAccessKey(s3Slug, account);
+    } = await module.exports.iam.createAccessKey(s3Slug);
 
     await module.exports.s3.createS3Bucket(
         s3Slug,
-        account,
         tags,
         false,
         "BucketOwnerPreferred",
     );
 
-    await module.exports.iam.ensureEBInstanceProfileExists(account);
+    await module.exports.iam.ensureEBInstanceProfileExists();
+    await module.exports.iam.ensureEBManagedUpdateProfileExists();
 
     try {
         await module.exports.elasticbeanstalk.createElasticBeanstalkApplication(
             repo,
-            account,
         );
     } catch {
         /* empty */
@@ -202,7 +200,7 @@ module.exports.fullstack = async (
     let hasKeyPair = false;
 
     try {
-        await module.exports.ec2.getKeyPair("id_rsa_prev", account);
+        await module.exports.ec2.getKeyPair("id_rsa_prev");
         hasKeyPair = true;
     } catch {
         /* empty */
@@ -214,7 +212,7 @@ module.exports.fullstack = async (
 
     const OptionSettings = eb.merge(
         "environments",
-        { framework, availability, platform, language },
+        { framework, availability, platform, language, database },
         { s3Slug, AccessKeyId, SecretAccessKey },
     );
 
@@ -229,7 +227,6 @@ module.exports.fullstack = async (
     const environment =
         await module.exports.elasticbeanstalk.createElasticBeanstalkEnvironment(
             name,
-            account,
             { framework, availability, platform, language },
             repo,
             OptionSettings,
@@ -283,23 +280,28 @@ module.exports.fullstack = async (
     return config;
 };
 
-module.exports.fullstackTerminate = async (name, account, repo, branch) => {
-    const s3Slug = module.exports.slug(repo, account, branch, "s3");
+module.exports.fullstackTerminate = async (name, repo, branch) => {
+    const s3Slug = module.exports.slug(
+        repo,
+        process.env.AWS_PROFILE,
+        branch,
+        "s3",
+    );
 
     try {
-        await module.exports.iam.removeIAMUser(s3Slug, account);
+        await module.exports.iam.removeIAMUser(s3Slug);
     } catch {
         /* empty */
     }
 
     try {
-        await module.exports.s3.emptyS3Bucket(s3Slug, account);
+        await module.exports.s3.emptyS3Bucket(s3Slug);
     } catch {
         /* empty */
     }
 
     try {
-        await module.exports.s3.removeS3Bucket(s3Slug, account);
+        await module.exports.s3.removeS3Bucket(s3Slug);
     } catch {
         /* empty */
     }
@@ -307,7 +309,6 @@ module.exports.fullstackTerminate = async (name, account, repo, branch) => {
     try {
         await module.exports.elasticbeanstalk.removeElasticBeanstalkEnvironment(
             name,
-            account,
         );
     } catch {
         /* empty */
@@ -316,7 +317,6 @@ module.exports.fullstackTerminate = async (name, account, repo, branch) => {
     try {
         await module.exports.elasticbeanstalk.removeElasticBeanstalkApplication(
             repo,
-            account,
         );
     } catch {
         /* empty */

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

@@ -1,11 +1,10 @@
-module.exports.createClient = (client, account, region = "us-east-1") => {
+module.exports.setAWSClientDefaults = (
+    account = "fishawack",
+    region = "us-east-1",
+) => {
     delete process.env.AWS_PROFILE;
     delete process.env.AWS_REGION;
 
-    if (account) {
-        process.env.AWS_PROFILE = account;
-        process.env.AWS_REGION = region;
-    }
-
-    return new client({ region });
+    process.env.AWS_PROFILE = account;
+    process.env.AWS_REGION = region;
 };

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

@@ -12,16 +12,14 @@ const {
     DeleteObjectsCommand,
 } = require("@aws-sdk/client-s3");
 const { Spinner } = require("../../libs/utilities");
-const { createClient } = require("./misc.js");
 
 module.exports.createS3Bucket = async (
     bucket,
-    account,
     tags = [],
     blockAccess = true,
     ObjectOwnership = "BucketOwnerEnforced",
 ) => {
-    const client = createClient(S3Client, account);
+    const client = new S3Client({});
 
     let res = await Spinner.prototype.simple(
         `Creating s3 bucket ${bucket}`,
@@ -54,7 +52,9 @@ module.exports.createS3Bucket = async (
             new PutBucketTaggingCommand({
                 Bucket: bucket,
                 Tagging: {
-                    TagSet: [{ Key: "client", Value: account }].concat(tags),
+                    TagSet: [
+                        { Key: "client", Value: process.env.AWS_PROFILE },
+                    ].concat(tags),
                 },
             }),
         );
@@ -63,8 +63,8 @@ module.exports.createS3Bucket = async (
     return res;
 };
 
-module.exports.listS3Buckets = async (account) => {
-    const client = createClient(S3Client, account);
+module.exports.listS3Buckets = async () => {
+    const client = new S3Client({});
 
     let res = await Spinner.prototype.simple(`Listing s3 buckets`, () => {
         return client.send(new ListBucketsCommand({}));
@@ -73,16 +73,16 @@ module.exports.listS3Buckets = async (account) => {
     return res;
 };
 
-module.exports.removeS3Bucket = async (bucket, account) => {
-    const client = createClient(S3Client, account);
+module.exports.removeS3Bucket = async (bucket) => {
+    const client = new S3Client({});
 
     await Spinner.prototype.simple(`Removing s3 bucket ${bucket}`, () => {
         return client.send(new DeleteBucketCommand({ Bucket: bucket }));
     });
 };
 
-module.exports.setS3BucketPolicy = async (bucket, account, OAI) => {
-    const client = createClient(S3Client, account);
+module.exports.setS3BucketPolicy = async (bucket, OAI) => {
+    const client = new S3Client({});
 
     let res = await Spinner.prototype.simple(
         `Updating s3 bucket policy`,
@@ -116,8 +116,8 @@ module.exports.setS3BucketPolicy = async (bucket, account, OAI) => {
     return res;
 };
 
-module.exports.addFileToS3Bucket = async (bucket, account, filepath, file) => {
-    const client = createClient(S3Client, account);
+module.exports.addFileToS3Bucket = async (bucket, filepath, file) => {
+    const client = new S3Client({});
 
     let res = await Spinner.prototype.simple(`Adding file to s3 bucket`, () => {
         return client.send(
@@ -132,8 +132,8 @@ module.exports.addFileToS3Bucket = async (bucket, account, filepath, file) => {
     return res;
 };
 
-module.exports.removeFileToS3Bucket = async (bucket, account, filepath) => {
-    const client = createClient(S3Client, account);
+module.exports.removeFileToS3Bucket = async (bucket, filepath) => {
+    const client = new S3Client({});
 
     let res = await Spinner.prototype.simple(
         `Removing file from s3 bucket`,
@@ -150,8 +150,8 @@ module.exports.removeFileToS3Bucket = async (bucket, account, filepath) => {
     return res;
 };
 
-module.exports.emptyS3Bucket = async (bucket, account) => {
-    const client = createClient(S3Client, account);
+module.exports.emptyS3Bucket = async (bucket) => {
+    const client = new S3Client({});
 
     await Spinner.prototype.simple(`Emptying s3 bucket`, () => {
         // eslint-disable-next-line no-async-promise-executor

package/commands/create/templates/elasticbeanstalk/.ebextensions/misc/asg-self-healing.config

@@ -0,0 +1,6 @@
+Resources:
+  AWSEBAutoScalingGroup:
+    Type: "AWS::AutoScaling::AutoScalingGroup"
+    Properties:
+      HealthCheckType: ELB
+      HealthCheckGracePeriod: 300

package/commands/create/templates/elasticbeanstalk/.ebextensions/misc/health-ignore-4xx.config

@@ -0,0 +1,4 @@
+option_settings:
+  - namespace: aws:elasticbeanstalk:healthreporting:system
+    option_name: ConfigDocument
+    value: '{"Version":1,"CloudWatchMetrics":{"Instance":{},"Environment":{}},"Rules":{"Environment":{"Application":{"ApplicationRequests4xx":{"Enabled":false}},"ELB":{"ELBRequests4xx":{"Enabled":false}}}}}'

package/commands/test.js

@@ -6,21 +6,21 @@ module.exports = [
     () => {},
     () => {
         _.up(() => {
+            _.command(
+                "core",
+                `${process.env.VERSION === "0" ? "xvfb-run " : ""}npm run test`,
+            );
+
             if (_.platform === "python") {
                 _.command("python", `uv run pytest -o log_cli=true`);
-            } else {
-                _.command(
-                    "core",
-                    `${process.env.VERSION === "0" ? "xvfb-run " : ""}npm run test`,
-                );
+            }
 
-                if (_.platform === "laravel") {
-                    _.command("php", `php artisan test`);
-                }
+            if (_.platform === "laravel") {
+                _.command("php", `php artisan test`);
+            }
 
-                if (_.platform === "adonis") {
-                    _.command("node", `node ace test`);
-                }
+            if (_.platform === "adonis") {
+                _.command("node", `node ace test`);
             }
         });
     },

package/core/0/package.json

@@ -4,7 +4,7 @@
     "description": "lab-env docker config for the @fishawack/core npm module",
     "scripts": {
         "preversion": "docker login",
-        "postversion": "docker build --platform linux/amd64 -t fishawack/core:$npm_package_version -t fishawack/core:latest . && docker push fishawack/core:$npm_package_version && docker push fishawack/core:latest && git add . && git commit -m \"build: Bumped core to $npm_package_version\""
+        "postversion": "docker build --platform linux/amd64 -t fishawack/core:$npm_package_version -t fishawack/core:latest . && docker push fishawack/core:$npm_package_version && docker push fishawack/core:latest && git add . && git commit -m \"build: bumped core to $npm_package_version\""
     },
     "author": "Mike Mellor",
     "license": "ISC"

package/craftcms/3/apache/package.json

@@ -4,7 +4,7 @@
     "description": "lab-env docker config for the apache module",
     "scripts": {
         "preversion": "docker login",
-        "postversion": "docker buildx build --target development --platform linux/amd64,linux/arm64 -t fishawack/lab-env-craftcms-3-apache:$npm_package_version -t fishawack/lab-env-craftcms-3-apache:latest --push . && git add . && git commit -m \"build: Bumped fishawack/lab-env-craftcms-3-apache to $npm_package_version\""
+        "postversion": "docker buildx build --target development --platform linux/amd64,linux/arm64 -t fishawack/lab-env-craftcms-3-apache:$npm_package_version -t fishawack/lab-env-craftcms-3-apache:latest --push . && git add . && git commit -m \"build: bumped fishawack/lab-env-craftcms-3-apache to $npm_package_version\""
     },
     "author": "Mike Mellor",
     "license": "ISC"

package/craftcms/3/php/package.json

@@ -4,7 +4,7 @@
     "description": "lab-env docker config for the php module",
     "scripts": {
         "preversion": "docker login",
-        "postversion": "docker buildx build --target development --platform linux/amd64,linux/arm64 -t fishawack/lab-env-craftcms-3-php:$npm_package_version -t fishawack/lab-env-craftcms-3-php:latest --push . && git add . && git commit -m \"build: Bumped fishawack/lab-env-craftcms-3-php to $npm_package_version\""
+        "postversion": "docker buildx build --target development --platform linux/amd64,linux/arm64 -t fishawack/lab-env-craftcms-3-php:$npm_package_version -t fishawack/lab-env-craftcms-3-php:latest --push . && git add . && git commit -m \"build: bumped fishawack/lab-env-craftcms-3-php to $npm_package_version\""
     },
     "author": "Mike Mellor",
     "license": "ISC"

package/drupal/9/apache/package.json

@@ -4,7 +4,7 @@
     "description": "lab-env docker config for the apache module",
     "scripts": {
         "preversion": "docker login",
-        "postversion": "docker buildx build --target development --platform linux/amd64,linux/arm64 -t fishawack/lab-env-drupal-9-apache:$npm_package_version -t fishawack/lab-env-drupal-9-apache:latest --push . && git add . && git commit -m \"build: Bumped fishawack/lab-env-drupal-9-apache to $npm_package_version\""
+        "postversion": "docker buildx build --target development --platform linux/amd64,linux/arm64 -t fishawack/lab-env-drupal-9-apache:$npm_package_version -t fishawack/lab-env-drupal-9-apache:latest --push . && git add . && git commit -m \"build: bumped fishawack/lab-env-drupal-9-apache to $npm_package_version\""
     },
     "author": "Mike Mellor",
     "license": "ISC"

package/drupal/9/php/package.json

@@ -4,7 +4,7 @@
     "description": "lab-env docker config for the php module",
     "scripts": {
         "preversion": "docker login",
-        "postversion": "docker buildx build --target development --platform linux/amd64,linux/arm64 -t fishawack/lab-env-drupal-9-php:$npm_package_version -t fishawack/lab-env-drupal-9-php:latest --push . && git add . && git commit -m \"build: Bumped fishawack/lab-env-drupal-9-php to $npm_package_version\""
+        "postversion": "docker buildx build --target development --platform linux/amd64,linux/arm64 -t fishawack/lab-env-drupal-9-php:$npm_package_version -t fishawack/lab-env-drupal-9-php:latest --push . && git add . && git commit -m \"build: bumped fishawack/lab-env-drupal-9-php to $npm_package_version\""
     },
     "author": "Mike Mellor",
     "license": "ISC"

package/globals.js

@@ -384,6 +384,8 @@ process.env.FW_LARAVEL_10_PHP_IMAGE =
 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 || ``;
+process.env.FW_PYTHON_0_IMAGE =
+    process.env.FW_PYTHON_0_IMAGE || `fishawack/lab-env-python-0`;
 
 var core = `-f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml`;
 
@@ -445,6 +447,9 @@ 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 || "";
+process.env.FW_PYTHON_0_VERSION =
+    process.env.FW_PYTHON_0_VERSION ||
+    require("./python/0/package.json").version;
 
 // Map docker contexts
 process.env.FW_CORE_1_CONTEXT =
@@ -522,6 +527,16 @@ if (existsSync(path.join(contextOverride, "Dockerfile"))) {
     ).version;
 }
 
+// PYTHON
+process.env.FW_PYTHON_0_CONTEXT =
+    process.env.FW_PYTHON_0_CONTEXT || `${__dirname}/python/0/`;
+
+contextOverride = path.join(cwd, "_Docker/python/0/");
+if (existsSync(path.join(contextOverride, "Dockerfile"))) {
+    process.env.FW_PYTHON_0_CONTEXT = contextOverride;
+    process.env.FW_PYTHON_0_IMAGE += `-${repoSafe}`;
+}
+
 // Copy env.example if .env doesnt exist
 if (
     existsSync(path.join(cwd, ".env.example")) &&

package/laravel/10/docker-compose.yml

@@ -23,6 +23,8 @@ services:
       - $CWD/:/app
     ports:
       - "${PORT_WEB:-8000}:80"
+    depends_on:
+      - php
   php:
     build:
       context: $FW_LARAVEL_10_PHP_CONTEXT

package/laravel/8/docker-compose.yml

@@ -24,6 +24,8 @@ services:
       - $CWD/:/app
     ports:
       - "${PORT_WEB:-8000}:80"
+    depends_on:
+      - php
   php:
     build:
       context: $DIRNAME/laravel/8/php/

package/laravel/8/nginx/CHANGELOG.md

@@ -1,4 +1,7 @@
 ## Changelog
 
+### 0.1.3 (2025-01-17)
+* [fix] nginx now resolves on request rather than start time to avoid race conditions
+
 ### 0.1.2 (2023-03-02)
 * [fix] nginx now sets upload limit to 500Mb

package/laravel/8/nginx/nginx.conf

@@ -13,6 +13,9 @@ server {
 
     charset utf-8;
 
+    # Docker embedded DNS
+    resolver 127.0.0.11 ipv6=off valid=10s;
+
     location / {
         try_files $uri $uri/ /index.php?$query_string;
     }
@@ -23,7 +26,8 @@ server {
     error_page 404 /index.php;
 
     location ~ \.php$ {
-		fastcgi_pass	php:9000;
+		set $upstream php:9000;
+        fastcgi_pass $upstream;
 		include         fastcgi_params;
 		fastcgi_param   SCRIPT_FILENAME    $document_root$fastcgi_script_name;
 		fastcgi_param   SCRIPT_NAME        $fastcgi_script_name;

package/laravel/8/nginx/package.json

@@ -1,10 +1,10 @@
 {
     "name": "nginx",
-    "version": "0.1.2",
+    "version": "0.1.3",
     "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-laravel-8-nginx:$npm_package_version -t fishawack/lab-env-laravel-8-nginx:latest --push . && git add . && git commit -m \"build: Bumped fishawack/lab-env-laravel-8-nginx to $npm_package_version\""
+        "postversion": "docker buildx build --target development --platform linux/amd64,linux/arm64 -t fishawack/lab-env-laravel-8-nginx:$npm_package_version -t fishawack/lab-env-laravel-8-nginx:latest --push . && git add . && git commit -m \"build: bumped fishawack/lab-env-laravel-8-nginx to $npm_package_version\""
     },
     "author": "Mike Mellor",
     "license": "ISC"

package/laravel/8/php/package.json

@@ -4,7 +4,7 @@
     "description": "lab-env docker config for the php module",
     "scripts": {
         "preversion": "docker login",
-        "postversion": "docker buildx build --target development --platform linux/amd64,linux/arm64 -t fishawack/lab-env-laravel-8-php:$npm_package_version -t fishawack/lab-env-laravel-8-php:latest --push . && git add . && git commit -m \"build: Bumped fishawack/lab-env-laravel-8-php to $npm_package_version\""
+        "postversion": "docker buildx build --target development --platform linux/amd64,linux/arm64 -t fishawack/lab-env-laravel-8-php:$npm_package_version -t fishawack/lab-env-laravel-8-php:latest --push . && git add . && git commit -m \"build: bumped fishawack/lab-env-laravel-8-php to $npm_package_version\""
     },
     "author": "Mike Mellor",
     "license": "ISC"

package/laravel/9/docker-compose.yml

@@ -23,6 +23,8 @@ services:
       - $CWD/:/app
     ports:
       - "${PORT_WEB:-8000}:80"
+    depends_on:
+      - php
   php:
     build:
       context: $FW_LARAVEL_9_PHP_CONTEXT

package/package.json

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

package/php/8.2/package.json

@@ -4,7 +4,7 @@
     "description": "lab-env docker config for the php module",
     "scripts": {
         "preversion": "docker login",
-        "postversion": "docker buildx build --target development --platform linux/amd64,linux/arm64 -t fishawack/lab-env-php-8-2:$npm_package_version -t fishawack/lab-env-php-8-2:latest --push . && git add . && git commit -m \"build: Bumped fishawack/lab-env-php-8-2 to $npm_package_version\""
+        "postversion": "docker buildx build --target development --platform linux/amd64,linux/arm64 -t fishawack/lab-env-php-8-2:$npm_package_version -t fishawack/lab-env-php-8-2:latest --push . && git add . && git commit -m \"build: bumped fishawack/lab-env-php-8-2 to $npm_package_version\""
     },
     "author": "Mike Mellor",
     "license": "ISC"

package/python/0/Dockerfile

@@ -0,0 +1,8 @@
+FROM ghcr.io/astral-sh/uv:python3.13-bookworm AS development
+
+LABEL org.opencontainers.image.authors="Mike Mellor <mike.mellor@avalerehealth.com>"
+
+FROM fishawack/lab-env-laravel-8-nginx:latest AS production
+
+# Copy source code into container
+COPY . /app

package/python/0/docker-compose.yml

@@ -1,6 +1,9 @@
 services:
   python:
-    image: ghcr.io/astral-sh/uv:python3.13-bookworm
+    build:
+      context: $FW_PYTHON_0_CONTEXT
+      target: development
+    image: $FW_PYTHON_0_IMAGE:${FW_PYTHON_0_VERSION:-latest}
     working_dir: /workspace
     command: sleep infinity
     tty: true

package/python/0/package.json

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

package/wordpress/0/package.json

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

package/wordpress/1/apache/package.json

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

package/wordpress/1/php/package.json

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