Merge pull request duplicati#4410 from warwickmm/use_consistent_mono_…

…images

Use consistent (and updated) mono versions for Docker and Travis

Installer/Docker/build-images.sh

@@ -55,6 +55,7 @@ docker buildx create --use --name duplicati-multiarch
 docker buildx build \
     ${args} \
     --platform ${PLATFORMS} \
+    --build-arg PARENT_IMAGE="$(cat mono_image.txt)-slim" \
     --build-arg VERSION=${VERSION} \
     --build-arg CHANNEL=${CHANNEL} \
     --file context/Dockerfile \

Installer/Docker/context/Dockerfile

@@ -1,4 +1,5 @@
-FROM --platform=$TARGETPLATFORM mono:5-slim
+ARG PARENT_IMAGE
+FROM --platform=$TARGETPLATFORM ${PARENT_IMAGE}
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \

Installer/Docker/mono_image.txt

@@ -0,0 +1 @@
+mono:6

pipeline/shared/duplicati.sh

@@ -6,4 +6,4 @@ declare -a FORWARD_OPTS
 
 export UPDATE_SOURCE="${DUPLICATI_ROOT}/Updates/build/${BUILDTAG}_source"
 export UPDATE_TARGET="${DUPLICATI_ROOT}/Updates/build/${BUILDTAG}_target"
-
+export MONO_IMAGE="$(cat "${TRAVIS_BUILD_DIR}/Installer/Docker/mono_image.txt")"

pipeline/stage_build/trigger.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 . error_handling.sh
+. ./pipeline/shared/duplicati.sh
 
 PACKAGES="libgtk2.0-cil rsync"
-docker-run --image mono \
+docker-run --image "${MONO_IMAGE}" \
 --packages "$PACKAGES" \
---command "/pipeline/stage_build/job.sh" $@
+--command "/pipeline/stage_build/job.sh" $@

pipeline/stage_unittests/trigger.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 . error_handling.sh
+. ./pipeline/shared/duplicati.sh
 
 PACKAGES="wget unzip rsync"
-docker-run --image mono \
+docker-run --image "${MONO_IMAGE}" \
 --packages "$PACKAGES" \
---command "/pipeline/stage_unittests/job.sh" $@
+--command "/pipeline/stage_unittests/job.sh" $@