From aca2f00da3bd3b1abac6bffb139a1b07cfacc761 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 6 Aug 2024 14:25:10 -0700 Subject: [PATCH] Remove duplicity https://github.com/tianon/dockerfiles/pull/774#issuecomment-2270127186 --- duplicity/Dockerfile | 27 --------------------------- duplicity/Dockerfile.template | 21 --------------------- duplicity/gsl.sh | 1 - duplicity/versions.json | 16 ---------------- duplicity/versions.sh | 25 ------------------------- 5 files changed, 90 deletions(-) delete mode 100644 duplicity/Dockerfile delete mode 100644 duplicity/Dockerfile.template delete mode 120000 duplicity/gsl.sh delete mode 100644 duplicity/versions.json delete mode 100755 duplicity/versions.sh diff --git a/duplicity/Dockerfile b/duplicity/Dockerfile deleted file mode 100644 index 16c910b7ba1..00000000000 --- a/duplicity/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM python:3.11-alpine3.20 - -RUN apk add --no-cache gnupg librsync - -# https://pypi.org/project/duplicity/ -# https://duplicity.gitlab.io/ -ENV DUPLICITY_VERSION 2.1.5 -# https://gitlab.com/duplicity/duplicity - -RUN set -eux; \ - apk add --no-cache --virtual .build-deps gcc gettext-tiny libc-dev librsync-dev; \ - pip install --no-cache-dir \ - "duplicity == $DUPLICITY_VERSION" \ -# https://pypi.org/project/b2sdk/ - 'b2sdk ~= 1.14' \ -# https://gitlab.com/duplicity/duplicity/-/blob/master/requirements.txt "backend libraries" - ; \ - apk del --no-network .build-deps; \ - duplicity --version - -CMD ["duplicity", "--help"] diff --git a/duplicity/Dockerfile.template b/duplicity/Dockerfile.template deleted file mode 100644 index 343a1ed443f..00000000000 --- a/duplicity/Dockerfile.template +++ /dev/null @@ -1,21 +0,0 @@ -FROM {{ .python.from }} - -RUN apk add --no-cache gnupg librsync - -# https://pypi.org/project/duplicity/ -# https://duplicity.gitlab.io/ -ENV DUPLICITY_VERSION {{ .version }} -# https://gitlab.com/duplicity/duplicity - -RUN set -eux; \ - apk add --no-cache --virtual .build-deps gcc gettext-tiny libc-dev librsync-dev; \ - pip install --no-cache-dir \ - "duplicity == $DUPLICITY_VERSION" \ -# https://pypi.org/project/b2sdk/ - 'b2sdk ~= 1.14' \ -# https://gitlab.com/duplicity/duplicity/-/blob/master/requirements.txt "backend libraries" - ; \ - apk del --no-network .build-deps; \ - duplicity --version - -CMD ["duplicity", "--help"] diff --git a/duplicity/gsl.sh b/duplicity/gsl.sh deleted file mode 120000 index 65ad8ee78fe..00000000000 --- a/duplicity/gsl.sh +++ /dev/null @@ -1 +0,0 @@ -../.gsl-common/gsl-version-env.sh \ No newline at end of file diff --git a/duplicity/versions.json b/duplicity/versions.json deleted file mode 100644 index 15025162559..00000000000 --- a/duplicity/versions.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": "2.1.5", - "python": { - "version": "3.11", - "from": "python:3.11-alpine3.20", - "arches": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "i386", - "ppc64le", - "s390x" - ] - } -} diff --git a/duplicity/versions.sh b/duplicity/versions.sh deleted file mode 100755 index c59defe6881..00000000000 --- a/duplicity/versions.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash -set -Eeuo pipefail - -[ -e versions.json ] - -dir="$(readlink -ve "$BASH_SOURCE")" -dir="$(dirname "$dir")" -source "$dir/../.libs/pypi.sh" - -versions_hooks+=( hook_no-prereleases ) - -export TIANON_PYTHON_FROM_TEMPLATE='python:%%PYTHON%%-alpine3.20' - -json="$( - hook_bad-duplicity-versions() { - case "$3" in - 2.0.0 | 2.0.2) return 1 ;; # https://gitlab.com/duplicity/duplicity/-/issues/746 - esac - } - versions_hooks+=( hook_bad-duplicity-versions ) - pypi 'duplicity' -)" -# TODO b2sdk pinning - -jq <<<"$json" '.' > versions.json