Skip to content

Commit

Permalink
Update containers to use pwsh 7
Browse files Browse the repository at this point in the history
  • Loading branch information
devblackops committed May 3, 2020
1 parent d2b8300 commit 7ffde48
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docker/nano/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/powershell:6.2.3-nanoserver-1903 as base
FROM microsoft/powershell:7.0.0-nanoserver-1903 as base
SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $VerbosePreference = 'Continue'; $ProgressPreference = 'SilentlyContinue';"]
RUN Set-PSRepository -Name PSGallery -InstallationPolicy Trusted; \
Install-Module Configuration -RequiredVersion 1.3.1 -Repository PSGallery -Scope AllUsers -Verbose; \
Expand Down
2 changes: 1 addition & 1 deletion docker/ubuntu16.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARG version
LABEL maintainer="devblackops"
LABEL description="PoshBot container for Ubuntu 16.04"
LABEL vendor="poshbotio"
COPY ["/out/poshbot/$version", "/opt/microsoft/powershell/6/Modules/PoshBot/"]
COPY ["/out/PoshBot/$version", "/opt/microsoft/powershell/7/Modules/PoshBot/"]
COPY ["/docker/docker_entrypoint.ps1", "/poshbot/docker_entrypoint.ps1"]
WORKDIR /poshbot/
VOLUME ["/poshbot_data"]
Expand Down
4 changes: 2 additions & 2 deletions docker/ubuntu18.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/powershell:6.2.3-ubuntu-18.04 as base
FROM mcr.microsoft.com/powershell:7.0.0-ubuntu-18.04 as base
SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
RUN Set-PSRepository -Name PSGallery -InstallationPolicy Trusted; \
Install-Module Configuration -RequiredVersion 1.3.1 -Repository PSGallery -Scope AllUsers -Verbose; \
Expand All @@ -9,7 +9,7 @@ ARG version
LABEL maintainer="devblackops"
LABEL description="PoshBot container for Ubuntu 18.04"
LABEL vendor="poshbotio"
COPY ["/out/poshbot/$version", "/opt/microsoft/powershell/6/Modules/PoshBot/"]
COPY ["/out/PoshBot/$version", "/opt/microsoft/powershell/7/Modules/PoshBot/"]
COPY ["/docker/docker_entrypoint.ps1", "/poshbot/docker_entrypoint.ps1"]
WORKDIR /poshbot/
VOLUME ["/poshbot_data"]
Expand Down
2 changes: 1 addition & 1 deletion docker/windowsservercore/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/powershell:6.2.3-windowsservercore-1903 as base
FROM microsoft/powershell:7.0.0-windowsservercore-1903 as base
SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
RUN Set-PSRepository -Name PSGallery -InstallationPolicy Trusted; \
Install-Module Configuration -RequiredVersion 1.3.1 -Repository PSGallery -Scope AllUsers -Verbose; \
Expand Down

0 comments on commit 7ffde48

Please sign in to comment.