Skip to content

Commit

Permalink
Merge pull request #378 from Badgerati/Issue-375
Browse files Browse the repository at this point in the history
#375: updates the dockerfile to PS v6.2.3
  • Loading branch information
Badgerati committed Sep 25, 2019
2 parents 271660c + fbda414 commit df6ae92
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/powershell:6.2.2-ubuntu-16.04
FROM mcr.microsoft.com/powershell:6.2.3-ubuntu-16.04
LABEL maintainer="Matthew Kelly (Badgerati)"
RUN mkdir -p /usr/local/share/powershell/Modules/Pode
COPY ./src/ /usr/local/share/powershell/Modules/Pode
2 changes: 1 addition & 1 deletion arm32.dockerfile
@@ -1,4 +1,4 @@
FROM badgerati/ps-core:6.2.2-arm32
FROM badgerati/ps-core:6.2.3-arm32
LABEL maintainer="Matthew Kelly (Badgerati)"
RUN mkdir -p /usr/local/share/powershell/Modules/Pode
COPY ./src/ /usr/local/share/powershell/Modules/Pode
2 changes: 1 addition & 1 deletion packers/docker/arm32/Dockerfile
@@ -1,6 +1,6 @@
FROM arm32v7/ubuntu:bionic

ENV PS_VERSION=6.2.2
ENV PS_VERSION=6.2.3
ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz
ENV PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}

Expand Down
6 changes: 5 additions & 1 deletion src/Private/Sockets.ps1
Expand Up @@ -62,14 +62,18 @@ function Start-PodeSocketListener
function Close-PodeSocket
{
param(
[Parameter(Mandatory=$true)]
[Parameter()]
[System.Net.Sockets.Socket]
$Socket,

[switch]
$Shutdown
)

if ($null -eq $Socket) {
return
}

if ($Shutdown -and $Socket.Connected) {
$Socket.Shutdown([System.Net.Sockets.SocketShutdown]::Both)
}
Expand Down

0 comments on commit df6ae92

Please sign in to comment.