Merge pull request #268 from datalust/fix/linux-publishing

More docker publishing tweaks

Author: nblumhardt

Build.Docker.ps1

@@ -28,7 +28,7 @@ function Execute-Tests
 function Build-DockerImage($arch)
 {
     $rid = "linux-$($arch.rid)"
-    & dotnet publish src/SeqCli/SeqCli.csproj -c Release -f $framework -r $rid --self-contained /p:VersionPrefix=$version
+    & dotnet publish src/SeqCli/SeqCli.csproj -c Release -f $framework -r $rid --self-contained /p:VersionPrefix=$version /p:PublishSingleFile=true
     if($LASTEXITCODE -ne 0) { exit 2 }
 
     & docker buildx build --platform "$($arch.platform)" -f dockerfiles/seqcli/$rid.Dockerfile -t "$image-ci:$version-$($arch.rid)" .

dockerfiles/seqcli/linux-arm64.Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=linux/arm/v8 ubuntu:22.04
+FROM ubuntu:22.04
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \

dockerfiles/seqcli/linux-x64.Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 ubuntu:22.04
+FROM ubuntu:22.04
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \

setup.sh

@@ -14,5 +14,5 @@ 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
+docker run --privileged --rm linuxkit/binfmt:bebbae0c1100ebf7bf2ad4dfb9dfd719cf0ef132
 sudo service docker restart

src/SeqCli/Util/Content.cs

@@ -1,12 +1,13 @@
-using System.IO;
+using System;
+using System.IO;
 
 namespace SeqCli.Util;
 
 static class Content
 {
     public static string GetPath(string relativePath)
     {
-        var thisDir = Path.GetDirectoryName(Path.GetFullPath(typeof(Content).Assembly.Location)) ?? ".";
+        var thisDir = Path.GetDirectoryName(Path.GetFullPath(AppContext.BaseDirectory)) ?? ".";
         return Path.Combine(thisDir, relativePath);
     }
 }