@fishawack/lab-env 4.12.0 → 4.13.0

package/CHANGELOG.md

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

package/core/1/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## Changelog
 
-### 1.1.5 (2023-02-25)
+### 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

package/core/1/Dockerfile

@@ -43,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/*
@@ -90,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core",
-  "version": "1.2.1",
+  "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.12.0",
+  "version": "4.13.0",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {