瀏覽代碼

Build fix for ruamel.yaml.clib error.

Dan Helfman 3 年之前
父節點
當前提交
e3f4bf0293
共有 2 個文件被更改,包括 4 次插入3 次删除
  1. 3 2
      docs/Dockerfile
  2. 1 1
      tests/end-to-end/docker-compose.yaml

+ 3 - 2
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 \

+ 1 - 1
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: