Fixed docker builds to use arch-specific tini.

Not using Alpine baseimage as it needs special dotnet builds.
This commit is contained in:
Kenneth Skovhede
2024-04-09 15:04:48 +02:00
parent c988ccdf76
commit f6678586e0
3 changed files with 6 additions and 9 deletions
+4 -5
View File
@@ -1,9 +1,7 @@
FROM --platform=$TARGETPLATFORM alpine:latest
FROM --platform=$TARGETPLATFORM debian:latest
ENV TINI_VERSION v0.19.0
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
RUN chmod +x /tini
ENTRYPOINT ["/tini", "--"]
RUN apt update && apt install tini
ENTRYPOINT [ "/usr/bin/tini", "--" ]
ENV XDG_CONFIG_HOME=/data
VOLUME /data
@@ -17,4 +15,5 @@ ARG TARGETARCH
COPY ./${TARGETARCH} /opt/duplicati
EXPOSE 8200
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
CMD ["/opt/duplicati/duplicati-server", "--webservice-port=8200", "--webservice-interface=any"]
@@ -763,7 +763,7 @@ public static partial class Command
var dockerArchs = targets.Select(target => target switch
{
PackageTarget { Arch: ArchType.x64, OS: OSType.Linux, Interface: InterfaceType.Cli } => "linux/amd64",
PackageTarget { Arch: ArchType.Arm64, OS: OSType.Linux, Interface: InterfaceType.Cli } => "linux/arm64",
PackageTarget { Arch: ArchType.Arm64, OS: OSType.Linux, Interface: InterfaceType.Cli } => "linux/arm64/v8",
PackageTarget { Arch: ArchType.Arm7, OS: OSType.Linux, Interface: InterfaceType.Cli } => "linux/arm/v7",
_ => throw new Exception($"Unsupported Docker target: {target.OS}/{target.Arch} ({target.Interface})")
});
@@ -798,7 +798,7 @@ public static partial class Command
tags.Add("latest");
// Make sure any dangling buildx instances are removed
try { await ProcessHelper.Execute([Program.Configuration.Commands.Docker!, "buildx", "rm", "duplicati-builder"], codeIsError: _ => false); }
try { await ProcessHelper.Execute([Program.Configuration.Commands.Docker!, "buildx", "rm", "duplicati-builder"], codeIsError: _ => false, suppressStdErr: true); }
catch { }
// Prepare multi-build
-2
View File
@@ -494,8 +494,6 @@ public static partial class Command
regex.Replace(File.ReadAllText(file), $"?v={releaseInfo.Version}")
);
//FILEMAP.Add("AssemblyRedirects.xml", new Regex(@"newVersion\=\""" + versionre + @"\"""));
return targetfiles;
}