Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump duplicity from 1.2.3 to 2.1.1 #654

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build(deps): bump duplicity from 1.2.3 to 2.1.1 #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ env:

jobs:
build-test:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
python:
- 3.9
- "3.10"
steps:
# Prepare environment
- uses: actions/checkout@v4
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
# Run tests
- run: poetry run pytest --prebuild
build-push:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
services:
registry:
image: registry:2
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11-slim AS builder
FROM python:3.10-slim AS builder

WORKDIR /app
ADD pyproject.toml poetry.lock ./
Expand All @@ -8,7 +8,7 @@ RUN pip install --no-cache-dir poetry
# Test comment
RUN poetry export --extras duplicity --output /app/requirements.txt

FROM python:3.11-alpine AS base
FROM python:3.10-alpine AS base

ENV CRONTAB_15MIN='*/15 * * * *' \
CRONTAB_HOURLY='0 * * * *' \
Expand Down Expand Up @@ -86,7 +86,7 @@ RUN chmod a+rx /usr/local/bin/* && sync
FROM base AS s3
ENV JOB_500_WHAT='dup full $SRC $DST' \
JOB_500_WHEN='weekly' \
OPTIONS_EXTRA='--metadata-sync-mode partial --full-if-older-than 1W --file-prefix-archive archive-$(hostname -f)- --file-prefix-manifest manifest-$(hostname -f)- --file-prefix-signature signature-$(hostname -f)- --s3-european-buckets --s3-multipart-chunk-size 10 --s3-use-new-style'
OPTIONS_EXTRA='--metadata-sync-mode partial --full-if-older-than 1W --file-prefix-archive archive-$(hostname -f)- --file-prefix-manifest manifest-$(hostname -f)- --file-prefix-signature signature-$(hostname -f)- --s3-multipart-chunk-size 10'


FROM base AS docker
Expand All @@ -96,7 +96,7 @@ RUN apk add --no-cache docker-cli
FROM docker AS docker-s3
ENV JOB_500_WHAT='dup full $SRC $DST' \
JOB_500_WHEN='weekly' \
OPTIONS_EXTRA='--metadata-sync-mode partial --full-if-older-than 1W --file-prefix-archive archive-$(hostname -f)- --file-prefix-manifest manifest-$(hostname -f)- --file-prefix-signature signature-$(hostname -f)- --s3-european-buckets --s3-multipart-chunk-size 10 --s3-use-new-style'
OPTIONS_EXTRA='--metadata-sync-mode partial --full-if-older-than 1W --file-prefix-archive archive-$(hostname -f)- --file-prefix-manifest manifest-$(hostname -f)- --file-prefix-signature signature-$(hostname -f)- --s3-multipart-chunk-size 10'


FROM base AS postgres
Expand Down Expand Up @@ -139,10 +139,10 @@ ENV JOB_200_WHEN='daily weekly' \
FROM postgres AS postgres-s3
ENV JOB_500_WHAT='dup full $SRC $DST' \
JOB_500_WHEN='weekly' \
OPTIONS_EXTRA='--metadata-sync-mode partial --full-if-older-than 1W --file-prefix-archive archive-$(hostname -f)- --file-prefix-manifest manifest-$(hostname -f)- --file-prefix-signature signature-$(hostname -f)- --s3-european-buckets --s3-multipart-chunk-size 10 --s3-use-new-style'
OPTIONS_EXTRA='--metadata-sync-mode partial --full-if-older-than 1W --file-prefix-archive archive-$(hostname -f)- --file-prefix-manifest manifest-$(hostname -f)- --file-prefix-signature signature-$(hostname -f)- --s3-multipart-chunk-size 10'


FROM postgres-s3 AS postgres-multi
ENV DST='multi' \
OPTIONS_EXTRA='--metadata-sync-mode partial --full-if-older-than 1W --file-prefix-archive archive-$(hostname -f)- --file-prefix-manifest manifest-$(hostname -f)- --file-prefix-signature signature-$(hostname -f)-' \
OPTIONS_EXTRA_S3='--s3-european-buckets --s3-multipart-chunk-size 10 --s3-use-new-style'
OPTIONS_EXTRA_S3='--s3-multipart-chunk-size 10'
58 changes: 43 additions & 15 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ PyDrive = {version = "^1.3.1", optional = true}
PyDrive2 = {version = "^1.17.0", optional = true}
python-swiftclient = {version = "^4.3.0", optional = true}
requests-oauthlib = {version = "^1.3.1", optional = true}
duplicity = {version = "^1.2.3", optional = true}
duplicity = {version = "^2.1.1", optional = true}
dropbox = {version = "^11.36.2", optional = true}
python-keystoneclient = {version = "^5.2.0", optional = true}
idna = {version = "3.4", optional = true}
Expand Down
Loading