diff options
| author | Kenneth Hsu <kennethhsu@gmail.com> | 2021-01-02 07:40:32 +0300 |
|---|---|---|
| committer | Kenneth Hsu <kennethhsu@gmail.com> | 2021-01-02 23:32:48 +0300 |
| commit | 6f41be3b4725f58b79f5bfd09b31c0738fafb159 (patch) | |
| tree | d9c8b447134fb60a01fa98d26edbe332327a6cc2 /Installer | |
| parent | 45c4f865e8b5c2e79c96628383d8dca4cdc5317d (diff) | |
Use consistent mono image for Docker and Travis tests.
Previously, Travis used the latest mono image. By using the same one as
the Docker image, we would have caught the problem in issue #4403
before the changes were merged into the master branch.
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..b20beab1f --- /dev/null +++ b/Installer/Docker/mono_image.txt @@ -0,0 +1 @@ +mono:5 |