From d543109ef4dafa5d24a703a765a6a794b986dea2 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Fri, 9 Apr 2021 15:58:23 -0700 Subject: [PATCH] "Fix" build failure with Alpine Edge by switching from Edge to Alpine 3.13. --- .drone.yml | 4 ++-- NEWS | 1 + tests/end-to-end/docker-compose.yaml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3ee385f9..f6c01087 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,7 +44,7 @@ steps: - scripts/run-full-tests --- kind: pipeline -name: python-3-8-alpine-edge +name: python-3-8-alpine-3-13 services: - name: postgresql @@ -60,7 +60,7 @@ services: steps: - name: build - image: alpine:edge + image: alpine:3.13 pull: always commands: - scripts/run-full-tests diff --git a/NEWS b/NEWS index 12e2b6ae..7c3616ec 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ 1.5.14.dev0 * #398: Clarify canonical home of borgmatic in documentation. * Fix build so as not to attempt to build and push documentation for a non-master branch. + * "Fix" build failure with Alpine Edge by switching from Edge to Alpine 3.13. 1.5.13 * #373: Document that passphrase is used for Borg keyfile encryption, not just repokey encryption. diff --git a/tests/end-to-end/docker-compose.yaml b/tests/end-to-end/docker-compose.yaml index 810caa11..3c081342 100644 --- a/tests/end-to-end/docker-compose.yaml +++ b/tests/end-to-end/docker-compose.yaml @@ -11,7 +11,7 @@ services: MYSQL_ROOT_PASSWORD: test MYSQL_DATABASE: test tests: - image: alpine:edge + image: alpine:3.13 volumes: - "../..:/app:ro" tmpfs: