Skip to content

Commit 0a816a0

Browse files
author
James Brundage
committed
Merge branch 'PipeScripting-Web' of https://github.com/StartAutomating/PipeScript into PipeScripting-Web
2 parents 4941d2c + 3847ce8 commit 0a816a0

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

Dockerfile

+6-5
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,18 @@ FROM mcr.microsoft.com/powershell
55
ENV PIPESCRIPT_VERSION 0.2.8
66

77

8-
RUN apt-get update && apt-get install -y git curl ca-certificates libc6 libgcc1
8+
RUN apt-get update && apt-get install -y git curl ca-certificates libc6 libgcc1 build-essential python3 nodejs && apt-get clean
99

10-
ENV PSModulePath ./Modules
1110

11+
COPY ./ ./usr/local/share/powershell/Modules/PipeScript
1212

13-
RUN opt/microsoft/powershell/7/pwsh --noprofile --nologo -c Install-Module 'Splatter','PSSVG','ugit','Irregular' -Scope CurrentUser -Force
13+
SHELL ["pwsh", "-noprofile", "-nologo", "-command"]
1414

1515

16-
COPY ./ ./Modules/PipeScript
16+
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')
1717

1818

19-
COPY ././Http.Server.Start.ps1 /root/.config/powershell/Microsoft.PowerShell_profile.ps1
19+
COPY ./Http.Server.Start.ps1 ./Http.Server.Start.ps1
20+
RUN Add-Content -Path \$Profile -Value ./Http.Server.Start.ps1
2021

2122

Languages/Docker/Templates/Docker-Template-LabelModule.ps1

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
[ValidatePattern("docker")]
2+
param()
3+
14

25
function Template.Docker.LabelModule {
36

0 commit comments

Comments
 (0)