@fishawack/lab-env 4.35.0 → 4.35.1

package/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "core/1"]
+	path = core/1
+	url = git@bitbucket.org:fishawackdigital/lab-env-core-1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## Changelog
 
+### 4.35.1 (2024-10-02)
+
+#### Build Updates
+
+* added setup script that inits submodules ([cdb1415](https://bitbucket.org/fishawackdigital/lab-env/commits/cdb14156ae73ef188d804ce84a5900f74d964e55))
+* Bumped lab-env-core-1 ([9fbdae6](https://bitbucket.org/fishawackdigital/lab-env/commits/9fbdae666f9c70ca82ca891c1027413415b8caac))
+* commit and open pull request against aws-runner on publish" ([174cb20](https://bitbucket.org/fishawackdigital/lab-env/commits/174cb2031dac53121e11c237cd3ddf54d93b6744))
+* escape quote in include check ([658f4ba](https://bitbucket.org/fishawackdigital/lab-env/commits/658f4ba6dadd217ce07486f1165a2a312892f7df))
+* exit early if semantic release doesnt publish anything ([99c7b9f](https://bitbucket.org/fishawackdigital/lab-env/commits/99c7b9fb13b55713fb4f522e08d98c778376fc9b))
+* installed core/1 as a submodule ([f40ad71](https://bitbucket.org/fishawackdigital/lab-env/commits/f40ad711acab83c29b30c3817c0731a956f44abb))
+* publish on more commit types ([4b8ac27](https://bitbucket.org/fishawackdigital/lab-env/commits/4b8ac2725d1a218c516682ec727ce869ddde1237))
+* remove core/1 from repo ([35e96ce](https://bitbucket.org/fishawackdigital/lab-env/commits/35e96ce7ea4723cdf5b144ce28f219b0ce4ca040))
+* use setup script instead of ci directly ([4e2464c](https://bitbucket.org/fishawackdigital/lab-env/commits/4e2464c6d0fd545a2fe4d91821ff56715a6816d6))
+
 ### 4.35.0 (2024-09-26)
 
 #### Features

package/bitbucket-pipelines.yml

@@ -39,7 +39,7 @@ pipelines:
           # 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'
+          - su aws-runner -c 'npm run setup'
           # Test
           - su aws-runner -c 'npm test'
         services:
@@ -56,7 +56,42 @@ pipelines:
           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
+            # 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
             # 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
+            - git fetch origin "+refs/heads/*:refs/remotes/origin/*" && git checkout -b development origin/development && git merge master && git push origin development
+            # 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$(git ls-remote --tags --refs --sort="v:refname" https://$GIT_CREDENTIALS@bitbucket.org/$BITBUCKET_REPO_FULL_NAME | tail -n1 | sed 's/.*\///')/g" Dockerfile
+            - git add .
+            - |
+              git commit --allow-empty -m "build: 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/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "4.35.0",
+  "version": "4.35.1",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {
+    "setup": "npm ci && git submodule init && git submodule update",
     "test": "rm -rf _Test/_fixtures/boilerplate*; CI_BUILD_ID=true mocha _Test/*.js --timeout 12000s --bail"
   },
   "repository": {
@@ -54,7 +55,29 @@
       [
         "@semantic-release/commit-analyzer",
         {
-          "preset": "conventionalcommits"
+          "preset": "conventionalcommits",
+          "releaseRules": [
+            {
+              "type": "build",
+              "release": "patch"
+            },
+            {
+              "type": "perf",
+              "release": "patch"
+            },
+            {
+              "type": "ci",
+              "release": "patch"
+            },
+            {
+              "type": "refactor",
+              "release": "patch"
+            },
+            {
+              "type": "style",
+              "release": "patch"
+            }
+          ]
         }
       ],
       [
@@ -66,7 +89,37 @@
             "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}}"
+            "commitUrlFormat": "{{host}}/{{owner}}/{{repository}}/commits/{{hash}}",
+            "types": [
+              {
+                "type": "feat",
+                "section": "Features"
+              },
+              {
+                "type": "fix",
+                "section": "Bug Fixes"
+              },
+              {
+                "type": "build",
+                "section": "Build Updates"
+              },
+              {
+                "type": "perf",
+                "section": "Performance Improvements"
+              },
+              {
+                "type": "ci",
+                "section": "CI/CD updates"
+              },
+              {
+                "type": "refactor",
+                "section": "Code Refactors"
+              },
+              {
+                "type": "style",
+                "section": "Style Updates"
+              }
+            ]
           }
         }
       ],

package/core/1/CHANGELOG.md

@@ -1,52 +0,0 @@
-## Changelog
-
-### 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,110 +0,0 @@
-#####
-# Alpine image
-#####
-
-FROM node:20.6 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
-
-# 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/docker-compose.yml

@@ -1,36 +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:-}
-volumes:
-  node_modules:
-    driver: "local"

package/core/1/entrypoint.sh

@@ -1,21 +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
-
-    # 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,11 +0,0 @@
-{
-  "name": "core",
-  "version": "1.4.1",
-  "description": "lab-env docker config for the @fishawack/core/1 npm module",
-  "scripts": {
-    "preversion": "docker login",
-    "postversion": "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 . && git add . && git commit -m \"build: Bumped fishawack/lab-env-core-1 to $npm_package_version\""
-  },
-  "author": "Mike Mellor",
-  "license": "ISC"
-}