@fishawack/lab-env 4.35.1 → 4.36.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 ## Changelog
 
+### 4.36.0 (2024-10-08)
+
+#### Features
+
+* content command now has init flag which returns s3 auto content config ([342c433](https://bitbucket.org/fishawackdigital/lab-env/commits/342c43301c92a2840125e28608450faa9540a226))
+
+#### Build Updates
+
+* add scope to pull request against aws-runner ([325e84a](https://bitbucket.org/fishawackdigital/lab-env/commits/325e84a10974c56700c51eaebf2b2b3c4d3e635d))
+* **core/1:** Bumped lab-env-core-1 ([2c7c446](https://bitbucket.org/fishawackdigital/lab-env/commits/2c7c446164ba9f52f509590c21a60ce7619cfd0e))
+* **core/1:** Bumped lab-env-core-1 ([de4a471](https://bitbucket.org/fishawackdigital/lab-env/commits/de4a471e23a088740ffc9eceef7473483fafae44))
+* only release on fix, feat and build updates ([9e8feb5](https://bitbucket.org/fishawackdigital/lab-env/commits/9e8feb5c9594fee29f21b721491d26b396534b44))
+
+### 4.35.2 (2024-10-02)
+
+#### Build Updates
+
+* install submodules during release so avail in npm module ([94f14a5](https://bitbucket.org/fishawackdigital/lab-env/commits/94f14a5849d7ad9027503865dd8d4395c25f077f))
+
 ### 4.35.1 (2024-10-02)
 
 #### Build Updates

package/bitbucket-pipelines.yml

@@ -54,6 +54,8 @@ pipelines:
             - 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
@@ -70,7 +72,7 @@ pipelines:
             - 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 commit --allow-empty -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 \

package/commands/content.js

@@ -1,8 +1,29 @@
+const execSync = require('child_process').execSync;
+const utilities = require('./create/libs/utilities');
 const _ = require('../globals.js');
 
 module.exports = [
     'content', 
     'pulls any external content and assets into the repo', 
-    yargs => {}, 
-    argv => _.command("core", `npm run content`)
+    yargs => {
+        yargs.option('init', {
+                alias: 'i',
+                describe: 'Returns config for s3 content folder',
+                type: 'boolean'
+            });
+    }, 
+    argv => {
+        if(argv.init){
+            const stringify = JSON.stringify({
+                "aws-s3": "fishawack",
+                "location": `fw-auto-content/${_.repo_safe}`,
+                "key": `fw-s3-${_.repo_safe}`,
+                "sync": true
+            }, null, 4);
+            execSync(`printf '${stringify}' | pbcopy`);
+            console.log(utilities.colorize(`\n${stringify}\n\n(copied to clipboard)`, 'title'));
+        } else {
+            _.command("core", `npm run content`)
+        }
+    }
 ];

package/core/1/CHANGELOG.md

@@ -0,0 +1,80 @@
+## Changelog
+
+### 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

@@ -0,0 +1,113 @@
+#####
+# 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
+
+# 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

@@ -0,0 +1,9 @@
+## 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

@@ -0,0 +1,68 @@
+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 development after publish
+            - 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 lab-env repo
+            - git config --global user.email "digital@fishawack.com"
+            - git config --global user.name "Digital Fishawack"
+            - git clone https://$GIT_CREDENTIALS@bitbucket.org/fishawackdigital/lab-env
+            - cd lab-env
+            - git checkout -b "$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT" origin/development
+            - 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\": \"development\"
+                    }
+                  },
+                  \"source\": {
+                    \"branch\": {
+                      \"name\": \"$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT\"
+                    }
+                  },
+                  \"reviewers\": [
+                      {
+                          \"uuid\": \"{2518e4c3-fc1d-4653-b355-c00be099ce6c}\"
+                      }
+                  ],
+                  \"close_source_branch\": true
+                }"
+          services:
+            - docker

package/core/1/docker-compose.yml

@@ -0,0 +1,36 @@
+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

@@ -0,0 +1,21 @@
+#!/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

@@ -0,0 +1,46 @@
+{
+  "name": "core",
+  "version": "1.5.2",
+  "description": "lab-env docker config for the @fishawack/core/1 npm module",
+  "scripts": {
+    "image": "docker buildx build --ssh default --platform linux/amd64,linux/arm64 -t fishawack/lab-env-core-1:$npm_package_version -t fishawack/lab-env-core-1:latest --push . && docker buildx build --ssh default --target alpine --platform linux/amd64,linux/arm64 -t fishawack/lab-env-core-1-alpine:$npm_package_version -t fishawack/lab-env-core-1-alpine:latest --push ."
+  },
+  "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"
+    ]
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "4.35.1",
+  "version": "4.36.0",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {
@@ -60,22 +60,6 @@
             {
               "type": "build",
               "release": "patch"
-            },
-            {
-              "type": "perf",
-              "release": "patch"
-            },
-            {
-              "type": "ci",
-              "release": "patch"
-            },
-            {
-              "type": "refactor",
-              "release": "patch"
-            },
-            {
-              "type": "style",
-              "release": "patch"
             }
           ]
         }
@@ -102,22 +86,6 @@
               {
                 "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"
               }
             ]
           }