From 5361f2c11fdb3a999ed4244f78b9db279dc4013c Mon Sep 17 00:00:00 2001 From: Peter Rekdal Khan-Sunde Date: Mon, 15 Aug 2022 08:56:11 +0200 Subject: [PATCH] Update docker image. --- .github/workflows/dotnetcore.yml | 4 ++-- build.ps1 | 4 ++-- docker/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 96478820..493f7fe7 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -15,8 +15,8 @@ env: GITVERSION_VERSION: 5.10.3 MSVS_TOOLSET_VERSION: 16 SNAPX_DOTNET_FRAMEWORK_VERSION: net6.0 - DOTNET_NET60_VERSION: 6.0.302 - DOTNET_NET70_VERSION: 7.0.100-preview.6.22352.1 + DOTNET_NET60_VERSION: 6.0.400 + DOTNET_NET70_VERSION: 7.0.100-preview.7.22377.5 DOTNET_CLI_TELEMETRY_OPTOUT: 1 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 DOTNET_NOLOGO: 1 diff --git a/build.ps1 b/build.ps1 index acfe0991..0623bcb3 100644 --- a/build.ps1 +++ b/build.ps1 @@ -8,7 +8,7 @@ param( [Parameter(Position = 2, ValueFromPipelineByPropertyName = $true)] [string] $DockerImageName = "snapx", [Parameter(Position = 3, ValueFromPipelineByPropertyName = $true)] - [string] $DockerVersion = "14.0", + [string] $DockerVersion = "15.0", [Parameter(Position = 4, ValueFromPipelineByPropertyName = $true)] [switch] $DockerLocal, [Parameter(Position = 5, ValueFromPipelineByPropertyName = $true)] @@ -69,7 +69,7 @@ switch -regex ($OSVersion) { } $DockerFilenamePath = Join-Path $WorkingDir docker\Dockerfile -$DockerGithubRegistryUrl = "docker.pkg.github.com/fintermobilityas/snapx" +$DockerGithubRegistryUrl = "ghcr.io/fintermobilityas" $Utf8NoBomEncoding = New-Object System.Text.UTF8Encoding $False $SummaryStopwatch = $Stopwatch::StartNew() diff --git a/docker/Dockerfile b/docker/Dockerfile index 28ce7ffd..c58b015a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,8 +3,8 @@ FROM ubuntu:20.04 as env-build ENV DEBIAN_FRONTEND=noninteractive ENV SNAPX_DOCKER_WORKING_DIR /build/snapx -ARG DOTNET_60_SDK_VERSION=6.0.302 -ARG DOTNET_70_SDK_VERSION=7.0.100-preview.6.22352.1 +ARG DOTNET_60_SDK_VERSION=6.0.400 +ARG DOTNET_70_SDK_VERSION=7.0.100-preview.7.22377.5 ARG DOTNET_RID=linux-x64