Skip to content

Commit 10fb731

Browse files
committed
Fix Dockerfile
Merges #76
1 parent 9ec12d7 commit 10fb731

4 files changed

Lines changed: 6 additions & 3 deletions

File tree

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ deb: dist/qr-backup-${VERSION}.tar.gz
3030
cd dist/debian && tar xf qr-backup_${VERSION}.orig.tar.gz
3131
cp -lr installers/debian dist/debian/qr-backup-${VERSION}/debian
3232
cd dist/debian/qr-backup-${VERSION} && debuild -us -uc
33+
docker:
34+
docker build -f installers/Dockerfile -t za3k/qr-backup:${VERSION} .
3335
clean:
3436
rm -rf dist deb_test
3537
install:

docs/CHANGELOG

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
- Added continuous integration
55
- Fixed bugs
66
- Corrected return code when --check-restore is enabled [(PR #51)](https://github.com/za3k/qr-backup/pull/61)
7-
- Updated debian package
7+
- Support Debian 13 release. Updated debian package, docker package.
88

99
v1.1.4, 2025-03-24
1010
- Improved note display

docs/CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Additional thanks to many contributors.
55
People who provided code:
66

77
- [Antoine Beaupré](https://github.com/anarcat), debian packaging; notes
8+
- [Chris Barry](https://github.com/chris-barry), docker bugfix
89
- [Julian Rüth](https://github.com/saraedum), bugfix
910
- [Summer Tea](https://github.com/acuteaangle), nix packaging; continuous integration
1011
- [tenzap](https://github.com/tenzap), debian packaging

installers/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.12
1+
FROM python:3.12-trixie
22

33
RUN apt-get update \
44
&& apt-get install -y \
@@ -16,7 +16,7 @@ RUN apt-get update \
1616
python3-reedsolo \
1717
&& apt-get autopurge -y \
1818
&& apt-get autoclean -y \
19-
&& sed -i 's/<policy domain="coder" rights="none" pattern="PDF" \/>/<policy domain="coder" rights="read|write" pattern="PDF" \/>/g' /etc/ImageMagick-6/policy.xml
19+
&& sed -i 's/<policy domain="coder" rights="none" pattern="PDF" \/>/<policy domain="coder" rights="read|write" pattern="PDF" \/>/g' /etc/ImageMagick-7/policy.xml
2020

2121
COPY ./requirements.txt /src/
2222

0 commit comments

Comments
 (0)