Skip to content

Commit 2ce7703

Browse files
authored
Merge pull request #87 from linuxserver/master-captcha-fonts
2 parents f840800 + dc4c5f3 commit 2ce7703

4 files changed

Lines changed: 9 additions & 2 deletions

File tree

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@ ENV HOME="/config" \
2121

2222
RUN \
2323
echo "**** install packages ****" && \
24+
echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \
2425
apt-get update && \
2526
apt-get install -y \
2627
libicu74 \
28+
ttf-mscorefonts-installer \
2729
unzip && \
2830
echo "**** install duplicati ****" && \
2931
if [ -z ${DUPLICATI_RELEASE+x} ]; then \
3032
DUPLICATI_RELEASE=$(curl -sX GET "https://api.github.com/repos/duplicati/duplicati/releases" \
31-
| jq -r 'first(.[] | select(.tag_name | contains("beta"))) | .tag_name'); \
33+
| jq -r 'first(.[] | select(.tag_name | contains("beta"))) | .tag_name'); \
3234
fi && \
3335
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$') && \
3436
curl -o \

Dockerfile.aarch64

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@ ENV HOME="/config" \
2121

2222
RUN \
2323
echo "**** install pockages ****" && \
24+
echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \
2425
apt-get update && \
2526
apt-get install -y \
2627
libicu74 \
28+
ttf-mscorefonts-installer \
2729
unzip && \
2830
echo "**** install duplicati ****" && \
2931
if [ -z ${DUPLICATI_RELEASE+x} ]; then \
3032
DUPLICATI_RELEASE=$(curl -sX GET "https://api.github.com/repos/duplicati/duplicati/releases" \
31-
| jq -r 'first(.[] | select(.tag_name | contains("beta"))) | .tag_name'); \
33+
| jq -r 'first(.[] | select(.tag_name | contains("beta"))) | .tag_name'); \
3234
fi && \
3335
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$') && \
3436
curl -o \

jenkins-vars.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ external_type: custom_json
66
release_type: stable
77
release_tag: latest
88
ls_branch: master
9+
image_sbom: true
10+
image_provenance: true
911
repo_vars:
1012
- JSON_URL = 'https://api.github.com/repos/duplicati/duplicati/releases'
1113
- JSON_PATH = 'first(.[] | select(.tag_name | contains("beta"))) | .tag_name'

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ app_setup_block: |
4949
5050
# changelog
5151
changelogs:
52+
- { date: "03.12.24:", desc: "Add mscorefonts for captcha support." }
5253
- { date: "29.11.24:", desc: "Rebase to Noble, add support for settings DB encryption." }
5354
- { date: "15.02.23:", desc: "Rebase to Jammy." }
5455
- { date: "03.08.22:", desc: "Deprecate armhf." }

0 commit comments

Comments
 (0)