Merge branch 'PipeScripting-Web' of https://github.com/StartAutomatin…

…g/PipeScript into PipeScripting-Web
StartAutomating · May 7, 2024 · 0a816a0 · 0a816a0
2 parents 4941d2c + 3847ce8
commit 0a816a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,17 +5,18 @@ FROM mcr.microsoft.com/powershell
 ENV PIPESCRIPT_VERSION 0.2.8
 
 
-RUN apt-get update && apt-get install -y git curl ca-certificates libc6 libgcc1
+RUN apt-get update && apt-get install -y git curl ca-certificates libc6 libgcc1 build-essential python3 nodejs && apt-get clean
 
-ENV PSModulePath ./Modules
 
+COPY ./ ./usr/local/share/powershell/Modules/PipeScript
 
-RUN opt/microsoft/powershell/7/pwsh --noprofile --nologo -c Install-Module 'Splatter','PSSVG','ugit','Irregular' -Scope CurrentUser -Force
+SHELL ["pwsh", "-noprofile", "-nologo", "-command"]
 
 
-COPY ./ ./Modules/PipeScript
+RUN @(Install-Module 'Splatter','PSSVG','ugit','Irregular' -AcceptLicense -Scope CurrentUser -Force && New-Item -ItemType File -Path \$Profile -Force | Add-Content -Value 'Import-Module Splatter','PSSVG','ugit','Irregular','PipeScript')
 
 
-COPY ././Http.Server.Start.ps1 /root/.config/powershell/Microsoft.PowerShell_profile.ps1
+COPY ./Http.Server.Start.ps1 ./Http.Server.Start.ps1 
+RUN Add-Content -Path \$Profile -Value ./Http.Server.Start.ps1
 
 
diff --git a/Languages/Docker/Templates/Docker-Template-LabelModule.ps1 b/Languages/Docker/Templates/Docker-Template-LabelModule.ps1
@@ -1,3 +1,6 @@
+[ValidatePattern("docker")]
+param()
+
 
 function Template.Docker.LabelModule {