diff options
| author | Kenneth Skovhede <kenneth@hexad.dk> | 2021-03-06 16:59:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-06 16:59:56 +0300 |
| commit | 2ec08314474c5e7fc6fb17324f98735b34dea052 (patch) | |
| tree | ef1ea5b10bdc522c8fe6c0bea861cbf78e6154a8 /Installer | |
| parent | 0c37b4fc3c2ede023911bb94375f1e4de23dadd2 (diff) | |
| parent | 529e4c7ce516635a0150e9fca3ef24c862d174b7 (diff) | |
Merge pull request #4410 from warwickmm/use_consistent_mono_images
Use consistent (and updated) mono versions for Docker and Travis
Diffstat (limited to 'Installer')
| -rwxr-xr-x | Installer/Docker/build-images.sh | 1 | ||||
| -rw-r--r-- | Installer/Docker/context/Dockerfile | 3 | ||||
| -rw-r--r-- | Installer/Docker/mono_image.txt | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/Installer/Docker/build-images.sh b/Installer/Docker/build-images.sh index 13cc5b18a..68143999a 100755 --- a/Installer/Docker/build-images.sh +++ b/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 \ diff --git a/Installer/Docker/context/Dockerfile b/Installer/Docker/context/Dockerfile index ffcd6e3cc..cc4c1ca62 100644 --- a/Installer/Docker/context/Dockerfile +++ b/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 \ diff --git a/Installer/Docker/mono_image.txt b/Installer/Docker/mono_image.txt new file mode 100644 index 000000000..62ea9e2ab --- /dev/null +++ b/Installer/Docker/mono_image.txt @@ -0,0 +1 @@ +mono:6 |