Move script changes to base image

StackEng · Dec 18, 2024 · f900990 · f900990
1 parent 6ba0d07
commit f900990
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 299 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,9 @@
 # These get copied locally when running Invoke-CNAB not in a container
 # Temporarily including these while building out CNAB v2 support
-# cnab/app/container-registry-discovery.ps1
-# cnab/app/gcp-cluster-discovery.ps1
-# cnab/app/run.ps1
-# cnab/app/utils.ps1
+cnab/app/container-registry-discovery.ps1
+cnab/app/gcp-cluster-discovery.ps1
+cnab/app/run.ps1
+cnab/app/utils.ps1
 
 #################
 ## Visual Studio

diff --git a/cnab/Invoke-CNAB.ps1 b/cnab/Invoke-CNAB.ps1
@@ -9,9 +9,9 @@ param (
     [string]
     $Target = "GCP",
     [bool]
-    $DownloadLocalScriptsForLocalDebugging = $false,
+    $DownloadLocalScriptsForLocalDebugging = $true,
     [string]
-    $Version = "2024.11.20.122",
+    $Version = "pr-21",
     [string]
     $PathToDeploymentPipelineVariables = "file:///D:/code/deployment-pipeline-variables"
 )

diff --git a/cnab/app/container-registry-discovery.ps1 b/cnab/app/container-registry-discovery.ps1
diff --git a/cnab/app/run b/cnab/app/run
diff --git a/cnab/app/run.ps1 b/cnab/app/run.ps1
diff --git a/cnab/app/utils.ps1 b/cnab/app/utils.ps1
diff --git a/cnab/build/Dockerfile b/cnab/build/Dockerfile
@@ -1,11 +1,9 @@
-FROM cr.stackoverflow.software/so-pubplat-cnab:2024.10.16.174409-276.1@sha256:36cf26cd2d2ea251ce46edcc966174ab1ed95ccf2818cdc763ba58a384328177
+FROM crdev.stackoverflow.software/so-pubplat-cnab:2024.12.18.144537-prerelease@sha256:742931970046fe449345b9960a4c1ca1a180adcb42f7d1f958105d8c227086e4
 
 COPY ./cnab/app /cnab/app
 COPY ./charts /cnab/app/charts
-RUN chmod 755 /cnab/app/run.ps1
-RUN chmod 755 /cnab/app/run
 
 ARG BUNDLE_VERSION
 ENV BUNDLE_VERSION=${BUNDLE_VERSION}
 
-CMD ["/cnab/app/run"]
+CMD ["/cnab/app/run.ps1"]