@fishawack/lab-env 4.11.1 → 4.13.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Changelog
 
+### 4.13.0 (2023-02-25)
+* [Change] Bumped fishawack/lab-env-core-1 to 1.2.2
+
+### 4.12.0 (2023-02-25)
+* [Change] Bumped fishawack/lab-env-core-1 to 1.2.1
+
 ### 4.11.1 (2023-02-25)
 * [Bug] coerce core version to remove tilde/carats
 

package/core/1/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Changelog
 
+### 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

package/core/1/Dockerfile

@@ -26,9 +26,7 @@ ENV PATH="${PATH}:/dart-sass/"
 RUN rm -rf /sass.tar.gz
 
 # Set safe directory to remove intel errors when running git rev-parse
-USER node
-RUN git config --global --add safe.directory /app
-USER root
+RUN su node -c "git config --global --add safe.directory /app"
 
 # Install lftp
 RUN apt-get install -y lftp
@@ -45,6 +43,12 @@ 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/*
@@ -69,14 +73,13 @@ RUN apt-get install -y ghostscript
 RUN apt-get install zip
 
 # Install AWS Elastic Beanstalk cli
-RUN apt-get install -y zlib1g-dev libssl-dev libncurses-dev libffi-dev libsqlite3-dev libreadline-dev libbz2-dev
-USER node
-RUN git clone https://github.com/aws/aws-elastic-beanstalk-cli-setup.git ~/aws-eb --depth 1 --branch v0.1.2
-RUN ~/aws-eb/scripts/bundled_installer
-RUN rm -rf ~/aws-eb
-ENV PATH="${PATH}:/home/node/.ebcli-virtual-env/executables"
-ENV PATH="${PATH}:/home/node/.pyenv/versions/3.7.2/bin"
-USER root
+ENV PATH="${PATH}:/.pyenv/versions/3.7.2/bin"
+ENV PATH="${PATH}:/.ebcli-virtual-env/executables"
+RUN apt-get install -y zlib1g-dev libssl-dev libncurses-dev libffi-dev libsqlite3-dev libreadline-dev libbz2-dev && \
+    git clone https://github.com/aws/aws-elastic-beanstalk-cli-setup.git ~/aws-eb --depth 1 --branch v0.1.2 && \
+    PYENV_ROOT=/.pyenv ~/aws-eb/scripts/python_installer && \
+    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"
@@ -93,9 +96,6 @@ RUN apt-get install -y wine64
 # Install watertight
 RUN --mount=type=ssh npm install -g git+ssh://git@bitbucket.org/fishawackdigital/watertight-node-auto.git#v6.0.0
 
-# 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/*

package/core/1/docker-compose.yml

@@ -22,6 +22,8 @@ services:
       - 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

@@ -6,7 +6,7 @@ if [ -z "$FW_ROOT" ]; then
     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 -R node:node /app/node_modules
+    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

package/core/1/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core",
-  "version": "1.1.4",
+  "version": "1.2.2",
   "description": "lab-env docker config for the @fishawack/core/1 npm module",
   "scripts": {
     "preversion": "docker login",

package/package.json

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