From e3f4bf0293c9908105b8da2b46ed69f40ffb814d Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Tue, 8 Feb 2022 12:52:45 -0800 Subject: [PATCH] Build fix for ruamel.yaml.clib error. --- docs/Dockerfile | 5 +++-- tests/end-to-end/docker-compose.yaml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/Dockerfile b/docs/Dockerfile index feadcd296..beab5e51a 100644 --- a/docs/Dockerfile +++ b/docs/Dockerfile @@ -1,7 +1,8 @@ -FROM python:3.8-alpine3.12 as borgmatic +FROM python:3.8-alpine3.13 as borgmatic COPY . /app -RUN pip install --no-cache ruamel.yaml.clib==0.2.6 /app && generate-borgmatic-config && chmod +r /etc/borgmatic/config.yaml +RUN apk add --no-cache py3-ruamel.yaml.clib +RUN pip install --no-cache /app && generate-borgmatic-config && chmod +r /etc/borgmatic/config.yaml RUN borgmatic --help > /command-line.txt \ && for action in init prune create check extract export-tar mount umount restore list info borg; do \ echo -e "\n--------------------------------------------------------------------------------\n" >> /command-line.txt \ diff --git a/tests/end-to-end/docker-compose.yaml b/tests/end-to-end/docker-compose.yaml index 835c2a70a..094ac8d37 100644 --- a/tests/end-to-end/docker-compose.yaml +++ b/tests/end-to-end/docker-compose.yaml @@ -16,7 +16,7 @@ services: MONGO_INITDB_ROOT_USERNAME: root MONGO_INITDB_ROOT_PASSWORD: test tests: - image: alpine:3.15 + image: alpine:3.13 volumes: - "../..:/app:ro" tmpfs: