From 0b65ff8071eb30869d26072545fa0e80950351eb Mon Sep 17 00:00:00 2001 From: BESANCON Vincent Date: Tue, 9 Jun 2026 15:18:04 +0200 Subject: [PATCH 1/5] chore(tools): bump --- .tool-versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.tool-versions b/.tool-versions index a21affd..d85520d 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -task 3.48.0 -git-cliff 2.12.0 +task 3.51.1 +git-cliff 2.13.1 From 9955f02921e64d48ba940520dd3927e1d4f4ae63 Mon Sep 17 00:00:00 2001 From: BESANCON Vincent Date: Tue, 9 Jun 2026 15:18:06 +0200 Subject: [PATCH 2/5] feat(syncthing): bump to 2.1.1 * [Release notes](https://github.com/syncthing/syncthing/releases/tag/v2.1.1) --- Dockerfile | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 46d12dc..a2e14b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ENV SYNCTHING_USER="syncthing" \ SYNCTHING_GROUP="syncthing" \ SYNCTHING_GROUP_GID=1000 \ SYNCTHING_ADMIN_USER="admin" \ - SYNCTHING_VERSION="2.0.15" \ + SYNCTHING_VERSION="2.1.1" \ SYNCTHING_ARCH="amd64" RUN set -x \ diff --git a/README.md b/README.md index 68341c9..a516566 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Following arch are missing tests: * [nventiveux/syncthing](https://hub.docker.com/r/nventiveux/syncthing) * Image version: `latest`, `3.1.0` ([Dockerfile](./Dockerfile)) - * Syncthing version: `v2.0.15` + * Syncthing version: `v2.1.1` ## Usage From 29c4d80e9dcdd7ec3b864e9ef9c15f1812996678 Mon Sep 17 00:00:00 2001 From: BESANCON Vincent Date: Tue, 9 Jun 2026 15:40:24 +0200 Subject: [PATCH 3/5] feat(config): bump config version schema to 52 --- Dockerfile | 29 ++++++++++++++--------------- rootfs/docker-entrypoint.sh | 2 +- rootfs/etc/syncthing/config.xml | 2 +- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index a2e14b0..d6d9f7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,8 @@ -FROM alpine:3.23 +FROM alpine:3.23.4 LABEL authors="nVentiveUX " LABEL license="MIT" -LABEL description="Docker image for syncthing installation. \ -Think for ARM / x64 devices." +LABEL description="Docker image for syncthing installation. Think for ARM / x64 devices." SHELL [ "/bin/ash", "-eo", "pipefail", "-c" ] @@ -17,26 +16,26 @@ ENV SYNCTHING_USER="syncthing" \ SYNCTHING_ARCH="amd64" RUN set -x \ - && apk add --no-cache \ + && apk add --no-cache \ bash \ coreutils \ py3-bcrypt \ py3-cryptography \ shadow \ su-exec \ - && tarball="syncthing-linux-${SYNCTHING_ARCH}-v${SYNCTHING_VERSION}.tar.gz" \ - && wget --quiet \ + && tarball="syncthing-linux-${SYNCTHING_ARCH}-v${SYNCTHING_VERSION}.tar.gz" \ + && wget --quiet \ "https://github.com/syncthing/syncthing/releases/download/v${SYNCTHING_VERSION}/$tarball" \ "https://github.com/syncthing/syncthing/releases/download/v${SYNCTHING_VERSION}/sha256sum.txt.asc" \ - && grep -E " ${tarball}\$" sha256sum.txt.asc | sha256sum -c - \ - && rm -rf "$GNUPGHOME" sha256sum.txt.asc \ - && dir="$(basename "$tarball" .tar.gz)" \ - && bin="$dir/syncthing" \ - && tar -xvzf "$tarball" "$bin" \ - && rm "$tarball" \ - && mv "$bin" /usr/local/bin/syncthing \ - && rmdir "$dir" \ - && mkdir -p /etc/syncthing /var/lib/syncthing + && grep -E " ${tarball}\$" sha256sum.txt.asc | sha256sum -c - \ + && rm -rf "$GNUPGHOME" sha256sum.txt.asc \ + && dir="$(basename "$tarball" .tar.gz)" \ + && bin="$dir/syncthing" \ + && tar -xvzf "$tarball" "$bin" \ + && rm "$tarball" \ + && mv "$bin" /usr/local/bin/syncthing \ + && rmdir "$dir" \ + && mkdir -p /etc/syncthing /var/lib/syncthing COPY rootfs/ / diff --git a/rootfs/docker-entrypoint.sh b/rootfs/docker-entrypoint.sh index de1e1a5..82c22e7 100755 --- a/rootfs/docker-entrypoint.sh +++ b/rootfs/docker-entrypoint.sh @@ -24,7 +24,7 @@ get_ownerships() { fi } -printf "* Generated salted password: %s\\n" "${SYNCTHING_ADMIN_PASSWORD_HASH}" +printf "* Generated salted password: %s\\n" "${SYNCTHING_ADMIN_PASSWORD_HASH:0:8}..." if ! getent passwd "${SYNCTHING_USER}" &>/dev/null then diff --git a/rootfs/etc/syncthing/config.xml b/rootfs/etc/syncthing/config.xml index 2e00f8b..9ed59f1 100644 --- a/rootfs/etc/syncthing/config.xml +++ b/rootfs/etc/syncthing/config.xml @@ -1,4 +1,4 @@ - +
0.0.0.0:8384
static From f0b707942960a4dfecc6e8a0edf5277651b06715 Mon Sep 17 00:00:00 2001 From: BESANCON Vincent Date: Tue, 9 Jun 2026 15:53:26 +0200 Subject: [PATCH 4/5] fix(tests): allow to select image tag in `tests` task --- Taskfile.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Taskfile.yml b/Taskfile.yml index 13c111d..9567edb 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -1,4 +1,4 @@ -version: '3' +version: "3" silent: true @@ -31,7 +31,9 @@ tasks: tests: desc: "Build and run the container for testing" cmds: - - docker run -it --rm -p 8000:8384 --name syncthing_tests {{.DOCKER_IMAGE}}:latest + - docker run -it --rm -p 8000:8384 --name syncthing_tests {{.DOCKER_IMAGE}}:{{.DOCKER_TAG}} + requires: + vars: [DOCKER_IMAGE, DOCKER_TAG] clean: desc: "Remove the local docker image" From 2ca130e33124f4415d0643ff3ff0d933b11bc5a7 Mon Sep 17 00:00:00 2001 From: BESANCON Vincent Date: Tue, 9 Jun 2026 15:53:34 +0200 Subject: [PATCH 5/5] chore(release): prepare for v3.2.0 --- CHANGELOG.md | 16 ++++++++++++++++ README.md | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37d2e78..4a51117 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file. +## 3.2.0 - 2026-06-09 + +### ⬆️ Upstream + +* **syncthing**: Bump to 2.1.1 + + * [Release notes](https://github.com/syncthing/syncthing/releases/tag/v2.1.1) + +### 🚀 Features + +* **config**: Bump config version schema to 52 + +### 🐛 Bug Fixes + +* **tests**: Allow to select image tag in `tests` task + ## 3.1.0 - 2026-03-03 ### ⬆️ Upstream diff --git a/README.md b/README.md index a516566..3cd1ccc 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Following arch are missing tests: ## Available image tags * [nventiveux/syncthing](https://hub.docker.com/r/nventiveux/syncthing) - * Image version: `latest`, `3.1.0` ([Dockerfile](./Dockerfile)) + * Image version: `latest`, `3.2.0` ([Dockerfile](./Dockerfile)) * Syncthing version: `v2.1.1` ## Usage