Skip to content

Commit db6dfb7

Browse files
committed
Make development beta releases
1 parent 701ce02 commit db6dfb7

File tree

9 files changed

+412
-422
lines changed

9 files changed

+412
-422
lines changed

.github/workflows/external_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
2727
echo "> External trigger running off of development branch. To disable this trigger, add \`duplicati_development\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
2828
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
29-
EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/duplicati/duplicati/releases" | jq -r '. | first(.[] | select(.tag_name | contains("canary"))) | .tag_name')
29+
EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/duplicati/duplicati/releases" | jq -r '. | first(.[] | select(.tag_name | contains("beta"))) | .tag_name')
3030
echo "Type is \`custom_json\`" >> $GITHUB_STEP_SUMMARY
3131
if grep -q "^duplicati_development_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
3232
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,10 @@ RUN \
3131
echo "**** install duplicati ****" && \
3232
if [ -z ${DUPLICATI_RELEASE+x} ]; then \
3333
DUPLICATI_RELEASE=$(curl -sX GET "https://api.github.com/repos/duplicati/duplicati/releases" \
34-
| jq -r 'first(.[] | select(.tag_name | contains("canary"))) | .tag_name'); \
34+
| jq -r 'first(.[] | select(.tag_name | contains("beta"))) | .tag_name'); \
3535
fi && \
36-
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$') || \
37-
duplicati_url="https://updates.duplicati.com/canary/duplicati-${DUPLICATI_RELEASE}-linux-x64-gui.zip" && \
38-
curl -fso \
36+
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$') && \
37+
curl -o \
3938
/tmp/duplicati.zip -L \
4039
"${duplicati_url}" && \
4140
unzip -q /tmp/duplicati.zip -d /app && \

Dockerfile.aarch64

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ENV HOME="/config" \
2020
DUPLICATI__WEBSERVICE_ALLOWED_HOSTNAMES=*
2121

2222
RUN \
23-
echo "**** install packages ****" && \
23+
echo "**** install pockages ****" && \
2424
echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \
2525
apt-get update && \
2626
apt-get install -y \
@@ -31,11 +31,10 @@ RUN \
3131
echo "**** install duplicati ****" && \
3232
if [ -z ${DUPLICATI_RELEASE+x} ]; then \
3333
DUPLICATI_RELEASE=$(curl -sX GET "https://api.github.com/repos/duplicati/duplicati/releases" \
34-
| jq -r 'first(.[] | select(.tag_name | contains("canary"))) | .tag_name'); \
34+
| jq -r 'first(.[] | select(.tag_name | contains("beta"))) | .tag_name'); \
3535
fi && \
36-
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$') || \
37-
duplicati_url="https://updates.duplicati.com/canary/duplicati-${DUPLICATI_RELEASE}-linux-arm64-gui.zip" && \
38-
curl -fso \
36+
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$') && \
37+
curl -o \
3938
/tmp/duplicati.zip -L \
4039
"${duplicati_url}" && \
4140
unzip -q /tmp/duplicati.zip -d /app && \

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pipeline {
2020
QUAYIO_API_TOKEN=credentials('quayio-repo-api-token')
2121
GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f')
2222
JSON_URL = 'https://api.github.com/repos/duplicati/duplicati/releases'
23-
JSON_PATH = 'first(.[] | select(.tag_name | contains("canary"))) | .tag_name'
23+
JSON_PATH = 'first(.[] | select(.tag_name | contains("beta"))) | .tag_name'
2424
BUILD_VERSION_ARG = 'DUPLICATI_RELEASE'
2525
LS_USER = 'linuxserver'
2626
LS_REPO = 'docker-duplicati'

README.md

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,15 @@ This image provides various versions that are available via tags. Please read th
6363

6464
| Tag | Available | Description |
6565
| :----: | :----: |--- |
66-
| latest || Beta releases of Duplicati |
67-
| development || Canary releases of Duplicati |
66+
| latest || Stable releases of Duplicati |
67+
| development || Beta releases of Duplicati |
6868

6969
## Application Setup
7070

7171
The webui is at `<your ip>:8200`.
7272

7373
For local backups select `/backups` as the destination. For more information see [Duplicati](https://www.duplicati.com/).
7474

75-
## Read-Only Operation
76-
77-
This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/).
78-
7975
## Usage
8076

8177
To help you get started creating a container from this image you can either use docker-compose or the docker cli.
@@ -142,7 +138,6 @@ Containers are configured using parameters passed at runtime (such as those abov
142138
| `-v /config` | Contains all relevant configuration files. |
143139
| `-v /backups` | Path to store local backups. |
144140
| `-v /source` | Path to source for files to backup. |
145-
| `--read-only=true` | Run container with a read-only filesystem. Please [read the docs](https://docs.linuxserver.io/misc/read-only/). |
146141

147142
## Environment variables from files (Docker secrets)
148143

@@ -306,18 +301,19 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
306301

307302
## Versions
308303

304+
* **31.01.25:** - Make `latest` stable releases, move beta releases to `development`.
309305
* **28.01.25:** - Add xz-utils.
310306
* **03.12.24:** - Add mscorefonts for captcha support.
311-
* **29.08.24:** - Add support for settings DB encryption.
312-
* **30.05.24:** - Rebase to Noble, switch to net core.
307+
* **29.11.24:** - Rebase to Noble, add support for settings DB encryption.
313308
* **15.02.23:** - Rebase to Jammy.
314309
* **03.08.22:** - Deprecate armhf.
315-
* **13.03.22:** - Fix artifact link.
316-
* **10.03.21:** - Rebase to focal baseimage with mono 6.12+.
310+
* **25.04.22:** - Rebase to mono:focal.
317311
* **01.08.19:** - Rebase to Linuxserver LTS mono version.
318312
* **16.07.19:** - Allow for additional command line arguments in an environment variable.
313+
* **28.06.19:** - Rebase to bionic.
319314
* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
320-
* **11.03.19:** - Rebase to bionic, add rclone.
315+
* **28.02.19:** - Allow access from all hostnames, clarify info on image tags.
316+
* **13.01.19:** - Use jq instead of awk in dockerfiles.
321317
* **11.01.19:** - Multi-arch image.
322318
* **09.12.17:** - Fix continuation lines.
323319
* **31.08.17:** - Build only beta or release versions (thanks deasmi).

jenkins-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ release_tag: development
88
ls_branch: development
99
repo_vars:
1010
- JSON_URL = 'https://api.github.com/repos/duplicati/duplicati/releases'
11-
- JSON_PATH = 'first(.[] | select(.tag_name | contains("canary"))) | .tag_name'
11+
- JSON_PATH = 'first(.[] | select(.tag_name | contains("beta"))) | .tag_name'
1212
- BUILD_VERSION_ARG = 'DUPLICATI_RELEASE'
1313
- LS_USER = 'linuxserver'
1414
- LS_REPO = 'docker-duplicati'

0 commit comments

Comments
 (0)