fix(docker): fix incorrect version being passed in during docker build

flxbl-io · Dec 16, 2024 · 68b6447 · 68b6447
1 parent ca7337e
commit 68b6447
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/sfp-build-docker.yml b/.github/workflows/sfp-build-docker.yml
@@ -88,7 +88,7 @@ jobs:
           tags: |
               ghcr.io/${{ inputs.repo }}/${{ inputs.image }}:${{ env.PKG_VERSION }}-${{ inputs.suffix-tag }}
           build-args: | 
-                  SFPOWERSCRIPTS_VERSION=${{ env.PKG_VERSION }}
+                  SFP_VERSION=${{ env.PKG_VERSION }}
                   GIT_COMMIT=${{ github.sha}}
 
 

diff --git a/dockerfiles/sfp-lite.Dockerfile b/dockerfiles/sfp-lite.Dockerfile
@@ -4,6 +4,7 @@ FROM ubuntu:24.04
 
 ARG GIT_COMMIT
 ARG NODE_MAJOR=22
+ARG SFP_VERSION
 
 LABEL org.opencontainers.image.description "sfp is a build system for modular development in Salesforce."
 LABEL org.opencontainers.image.licenses "MIT"
@@ -56,7 +57,7 @@ RUN mkdir -p /etc/apt/keyrings \
 
 # Install sfp
 RUN npm install --global --omit=dev \
-    @flxbl-io/sfp@${SFPOWERSCRIPTS_VERSION} 
+    @flxbl-io/sfp@${SFP_VERSION} 
 
 WORKDIR /root
 

diff --git a/dockerfiles/sfp.Dockerfile b/dockerfiles/sfp.Dockerfile
@@ -6,6 +6,7 @@ ARG BROWSERFORCE_VERSION=4.5.0
 ARG SFDMU_VERSION=4.37.0
 ARG GIT_COMMIT
 ARG NODE_MAJOR=22
+ARG SFP_VERSION
 
 LABEL org.opencontainers.image.description "sfp is a build system for modular development in Salesforce."
 LABEL org.opencontainers.image.licenses "MIT"
@@ -89,7 +90,7 @@ RUN npm install --global yarn --omit-dev \
 # Install SF cli and sfpowerscripts
 RUN npm install --global --omit=dev \
     @salesforce/cli@${SF_CLI_VERSION} \
-    @flxbl-io/sfp@${SFPOWERSCRIPTS_VERSION} \
+    @flxbl-io/sfp@${SFP_VERSION} \
     && npm cache clean --force