Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@ on:
branches:
- "master"

env:
IMAGE_NAME: "nventiveux/syncthing"
DOCKER_BUILDKIT: "1"

jobs:
lint:
name: "Linting"
runs-on: "ubuntu-22.04"
runs-on: "ubuntu-24.04"
steps:
- uses: "actions/checkout@v3"

Expand All @@ -19,7 +23,7 @@ jobs:

build:
name: "Build"
runs-on: "ubuntu-22.04"
runs-on: "ubuntu-24.04"
steps:
- uses: "actions/checkout@v3"

Expand All @@ -34,12 +38,18 @@ jobs:
with:
install: true

- name: "Login to DockerHub"
uses: "docker/login-action@v2"
with:
username: "${{ secrets.DOCKER_USERNAME }}"
password: "${{ secrets.DOCKER_PASSWORD }}"

- name: "Build images"
uses: "docker/build-push-action@v3"
with:
builder: "${{ steps.buildx.outputs.name }}"
context: "."
file: "./Dockerfile"
platforms: "linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6"
push: false
tags: "latest"
push: true
tags: "${{ env.IMAGE_NAME }}:pr-${{ github.event.number }}"
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## v2.0.10 (2025-10-23)

### Feat

- prepare for syncthing v2

### Fix

- **ci**: login to docker hub in pr

## v1.30.0 (2025-07-15)

### Feat
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.21
FROM alpine:3.22

LABEL authors="nVentiveUX <https://github.com/nVentiveUX>"
LABEL license="MIT"
Expand All @@ -13,7 +13,7 @@ ENV SYNCTHING_USER="syncthing" \
SYNCTHING_GROUP="syncthing" \
SYNCTHING_GROUP_GID=1000 \
SYNCTHING_ADMIN_USER="admin" \
SYNCTHING_VERSION="1.30.0" \
SYNCTHING_VERSION="2.0.10" \
SYNCTHING_ARCH="amd64"

RUN set -x \
Expand Down Expand Up @@ -46,4 +46,4 @@ EXPOSE 8384/tcp 22000/tcp 22000/udp 21027/udp

ENTRYPOINT ["/docker-entrypoint.sh"]

CMD ["syncthing", "-home=/etc/syncthing", "-logflags=0"]
CMD ["syncthing", "--home=/etc/syncthing", "--logflags=0"]
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build:

.PHONY: tests
tests: build
docker run -it --rm --name syncthing_tests local/syncthing:latest
docker run -it --rm -p 8000:8384 --name syncthing_tests local/syncthing:latest

.PHONY: clean
clean:
Expand Down
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Following arch are missing tests:
## Available image tags

* [nventiveux/syncthing](https://hub.docker.com/r/nventiveux/syncthing)
* `latest`, `v1.30.0` ([Dockerfile](./Dockerfile))
* `latest`, `v2.0.10` ([Dockerfile](./Dockerfile))

## Usage

Expand Down Expand Up @@ -103,21 +103,27 @@ make install

Tweak `Dockerfile` to your convenience.

**Note**: if you are upgrading Syncthing to a newer version, also [sync the config file version](https://github.com/syncthing/syncthing/blob/main/lib/config/config.go#L34) !
**Note**: if you are upgrading Syncthing to a newer version, also [sync the config file version](https://github.com/syncthing/syncthing/blob/main/lib/config/config.go#L36) !

Commit changes and submit a **Pull Request**.

### Releasing a new version

Bump the version using:

```shell
```sh
git switch -c release/next
make release version=<VERSION>
git commit -a -m "feat(core): bump syncthing to <VERSION>"
# Open a pull request
# Tests...
```

Release:

```sh
uv run cz bump --changelog <VERSION>
git push origin -u --tags HEAD
# Open a pull request
```

## References
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "docker-syncthing"
version = "1.30.0"
version = "2.0.10"
description = "Syncthing as a container using Docker"
authors = [
{ name = "BESANCON Vincent", email = "besancon.vincent@gmail.com" }
Expand All @@ -15,7 +15,7 @@ dependencies = [

[tool.commitizen]
name = "cz_conventional_commits"
version = "1.30.0"
version = "2.0.10"
tag_format = "v$version"
version_files = [
"pyproject.toml:version"
Expand Down
2 changes: 1 addition & 1 deletion rootfs/etc/syncthing/config.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<configuration version="37">
<configuration version="51">
<gui enabled="true" tls="true" debugging="false">
<address>0.0.0.0:8384</address>
<authMode>static</authMode>
Expand Down
4 changes: 2 additions & 2 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.