From 8ea8205428cd910b3d360fb908f3095f7d4420f2 Mon Sep 17 00:00:00 2001 From: thespad Date: Tue, 3 Dec 2024 14:36:58 +0000 Subject: [PATCH 1/4] Add mscorefonts for captcha support --- Dockerfile | 2 ++ Dockerfile.aarch64 | 2 ++ readme-vars.yml | 1 + 3 files changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index 617bfb0..6283ee0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,9 +21,11 @@ ENV HOME="/config" \ RUN \ echo "**** install packages ****" && \ + cho ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \ apt-get update && \ apt-get install -y \ libicu74 \ + ttf-mscorefonts-installer \ unzip && \ echo "**** install duplicati ****" && \ if [ -z ${DUPLICATI_RELEASE+x} ]; then \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c062455..3fdaff8 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -21,9 +21,11 @@ ENV HOME="/config" \ RUN \ echo "**** install pockages ****" && \ + echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \ apt-get update && \ apt-get install -y \ libicu74 \ + ttf-mscorefonts-installer \ unzip && \ echo "**** install duplicati ****" && \ if [ -z ${DUPLICATI_RELEASE+x} ]; then \ diff --git a/readme-vars.yml b/readme-vars.yml index bdd5916..11947c2 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,6 +49,7 @@ app_setup_block: | # changelog changelogs: + - { date: "03.12.24:", desc: "Add mscorefonts for captcha support." } - { date: "29.11.24:", desc: "Rebase to Noble, add support for settings DB encryption." } - { date: "15.02.23:", desc: "Rebase to Jammy." } - { date: "03.08.22:", desc: "Deprecate armhf." } From c9502cc92ba47bf61d41ab20e2e694b321885b98 Mon Sep 17 00:00:00 2001 From: thespad Date: Tue, 3 Dec 2024 14:37:03 +0000 Subject: [PATCH 2/4] Enable SBOM/Provenance --- jenkins-vars.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 55fb411..7a9dc89 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,6 +6,8 @@ external_type: custom_json release_type: stable release_tag: latest ls_branch: master +image_sbom: true +image_provenance: true repo_vars: - JSON_URL = 'https://api.github.com/repos/duplicati/duplicati/releases' - JSON_PATH = 'first(.[] | select(.tag_name | contains("beta"))) | .tag_name' From d9c72bd515de7391af8f9a31ffac10fee8f465e4 Mon Sep 17 00:00:00 2001 From: thespad Date: Tue, 3 Dec 2024 14:37:24 +0000 Subject: [PATCH 3/4] Add e --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6283ee0..0241826 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ ENV HOME="/config" \ RUN \ echo "**** install packages ****" && \ - cho ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \ + echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \ apt-get update && \ apt-get install -y \ libicu74 \ From dc4c5f31c932aef7482e14a1d9c9ce87c5b26b6f Mon Sep 17 00:00:00 2001 From: thespad Date: Wed, 4 Dec 2024 16:32:30 +0000 Subject: [PATCH 4/4] Indents --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0241826..ab5972b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ RUN \ echo "**** install duplicati ****" && \ if [ -z ${DUPLICATI_RELEASE+x} ]; then \ DUPLICATI_RELEASE=$(curl -sX GET "https://api.github.com/repos/duplicati/duplicati/releases" \ - | jq -r 'first(.[] | select(.tag_name | contains("beta"))) | .tag_name'); \ + | jq -r 'first(.[] | select(.tag_name | contains("beta"))) | .tag_name'); \ fi && \ duplicati_url=$(curl -s "https://api.github.com/repos/duplicati/duplicati/releases/tags/${DUPLICATI_RELEASE}" | jq -r '.assets[].browser_download_url' |grep 'linux-x64-gui.zip$') && \ curl -o \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 3fdaff8..b674fea 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -30,7 +30,7 @@ RUN \ echo "**** install duplicati ****" && \ if [ -z ${DUPLICATI_RELEASE+x} ]; then \ DUPLICATI_RELEASE=$(curl -sX GET "https://api.github.com/repos/duplicati/duplicati/releases" \ - | jq -r 'first(.[] | select(.tag_name | contains("beta"))) | .tag_name'); \ + | jq -r 'first(.[] | select(.tag_name | contains("beta"))) | .tag_name'); \ fi && \ duplicati_url=$(curl -s "https://api.github.com/repos/duplicati/duplicati/releases/tags/${DUPLICATI_RELEASE}" | jq -r '.assets[].browser_download_url' |grep 'linux-arm64-gui.zip$') && \ curl -o \