psw/borgmatic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing ruamel.yaml.clib breakages harder.

Browse source
This commit is contained in:
Dan Helfman 2022-02-08 13:21:11 -08:00
parent e3f4bf0293
commit ee466f870d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/Dockerfile
View file

@ -1,7 +1,7 @@
FROM python:3.8-alpine3.13 as borgmatic FROM python:3.8-alpine3.13 as borgmatic
COPY . /app COPY . /app
RUN apk add --no-cache py3-ruamel.yaml.clib RUN apk add --no-cache py3-ruamel.yaml py3-ruamel.yaml.clib
RUN pip install --no-cache /app && generate-borgmatic-config && chmod +r /etc/borgmatic/config.yaml RUN pip install --no-cache /app && generate-borgmatic-config && chmod +r /etc/borgmatic/config.yaml
RUN borgmatic --help > /command-line.txt \ RUN borgmatic --help > /command-line.txt \
&& for action in init prune create check extract export-tar mount umount restore list info borg; do \ && for action in init prune create check extract export-tar mount umount restore list info borg; do \

2
scripts/run-full-tests
View file

@ -11,7 +11,7 @@
set -e set -e
apk add --no-cache python3 py3-pip borgbackup postgresql-client mariadb-client mongodb-tools \ apk add --no-cache python3 py3-pip borgbackup postgresql-client mariadb-client mongodb-tools \
py3-ruamel.yaml.clib py3-ruamel.yaml py3-ruamel.yaml.clib
# If certain dependencies of black are available in this version of Alpine, install them. # If certain dependencies of black are available in this version of Alpine, install them.
apk add --no-cache py3-typed-ast py3-regex || true apk add --no-cache py3-typed-ast py3-regex || true
python3 -m pip install --no-cache --upgrade pip==22.0.3 setuptools==60.8.1 python3 -m pip install --no-cache --upgrade pip==22.0.3 setuptools==60.8.1