Merge pull request #237 from datalust/dev

2022.1.579 Release

Author: KodrAus

Build.Docker.ps1

@@ -4,7 +4,10 @@ $IsPublishedBuild = ($env:APPVEYOR_REPO_BRANCH -eq "main" -or $env:APPVEYOR_REPO
 $version = @{ $true = $env:APPVEYOR_BUILD_VERSION; $false = "99.99.99" }[$env:APPVEYOR_BUILD_VERSION -ne $NULL];
 $framework = "net6.0"
 $image = "datalust/seqcli"
-$archs = @("x64", "arm64")
+$archs = @(
+    @{ rid = "x64"; platform = "linux/amd64" },
+    @{ rid = "arm64"; platform = "linux/arm/v8" }
+)
 
 function Execute-Tests
 {
@@ -24,11 +27,11 @@ function Execute-Tests
 
 function Build-DockerImage($arch)
 {
-    $rid = "linux-$arch"
+    $rid = "linux-$($arch.rid)"
     & dotnet publish src/SeqCli/SeqCli.csproj -c Release -f $framework -r $rid --self-contained /p:VersionPrefix=$version
     if($LASTEXITCODE -ne 0) { exit 2 }
 
-    & docker build -f dockerfiles/seqcli/$rid.Dockerfile -t "$image-ci:$version-$arch" .
+    & docker buildx build --platform "$($arch.platform)" -f dockerfiles/seqcli/$rid.Dockerfile -t "$image-ci:$version-$($arch.rid)" .
     if($LASTEXITCODE -ne 0) { exit 3 }
 }
 
@@ -41,7 +44,7 @@ function Publish-DockerImage($arch)
         if ($LASTEXITCODE) { exit 3 }
     }
 
-    & docker push "$image-ci:$version-$arch"
+    & docker push "$image-ci:$version-$($arch.rid)"
     if($LASTEXITCODE -ne 0) { exit 3 }
 
     $ErrorActionPreference = "Stop"

appveyor.yml

@@ -2,7 +2,7 @@ version: 2022.1.{build}
 skip_tags: true
 image:
 - Visual Studio 2022
-- Ubuntu1804
+- Ubuntu2004
 environment:
   DOCKER_TOKEN:
    secure: QKr2YEuliXdFKe3jN7w97w==
@@ -47,7 +47,7 @@ for:
 -
   matrix:
     only:
-      - image: Ubuntu1804
+      - image: Ubuntu2004
 
   install:
   - pwsh: ./setup.sh

docker-publish.ps1

@@ -17,7 +17,7 @@ $publishImages = @()
 
 foreach ($arch in $archs) {
     $ciImage = "$image-ci:$version-$arch"
-    $publishImage = "$image:$version-$arch";
+    $publishImage = "$($image):$version-$arch";
 
     docker pull $ciImage
     if ($LASTEXITCODE) { exit 1 }
@@ -31,14 +31,14 @@ foreach ($arch in $archs) {
     $publishImages += $publishImage
 }
 
-$publishManifest = "$image:$version"
+$publishManifest = "$($image):$version"
 
 $pushTags = @($publishManifest)
 
 if ($isPre -eq $True) {
-    $pushTags += "$image:preview"
+    $pushTags += "$($image):preview"
 } else {
-    $pushTags += "$image:$major", "$image:$major.$minor", "$image:latest"
+    $pushTags += "$($image):$major", "$($image):$major.$minor", "$($image):latest"
 }
 
 $choices  = "&Yes", "&No"

setup.sh

@@ -13,3 +13,6 @@ curl https://dot.net/v1/dotnet-install.sh -sSfL --output dotnet-install.sh
 chmod +x dotnet-install.sh
 ./dotnet-install.sh --install-dir $HOME/.dotnetcli --no-path --version $RequiredDotnetVersion
 rm dotnet-install.sh
+
+docker run --privileged --rm docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64
+sudo service docker restart