From fbda4145a7c15f0b3d700f39cd453b2f6d89eeb4 Mon Sep 17 00:00:00 2001 From: Matthew Kelly Date: Wed, 25 Sep 2019 19:09:42 +0100 Subject: [PATCH] #375: updates the dockerfile to PS v6.2.3 --- Dockerfile | 2 +- arm32.dockerfile | 2 +- packers/docker/arm32/Dockerfile | 2 +- src/Private/Sockets.ps1 | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 91254bc78..74bc06f4c 100644 --- a/Dockerfile +++ b/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 \ No newline at end of file diff --git a/arm32.dockerfile b/arm32.dockerfile index 2511e0fa0..8b297d0cf 100644 --- a/arm32.dockerfile +++ b/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 \ No newline at end of file diff --git a/packers/docker/arm32/Dockerfile b/packers/docker/arm32/Dockerfile index c1bec9f75..d2219eb5a 100644 --- a/packers/docker/arm32/Dockerfile +++ b/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} diff --git a/src/Private/Sockets.ps1 b/src/Private/Sockets.ps1 index d441c3719..3ac0f55e7 100644 --- a/src/Private/Sockets.ps1 +++ b/src/Private/Sockets.ps1 @@ -62,7 +62,7 @@ function Start-PodeSocketListener function Close-PodeSocket { param( - [Parameter(Mandatory=$true)] + [Parameter()] [System.Net.Sockets.Socket] $Socket, @@ -70,6 +70,10 @@ function Close-PodeSocket $Shutdown ) + if ($null -eq $Socket) { + return + } + if ($Shutdown -and $Socket.Connected) { $Socket.Shutdown([System.Net.Sockets.SocketShutdown]::Both) }