octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-04-02 07:41:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

docker: Fix handling of PCAP variable (fixes #8567) (#8568)

Browse Source 
This correctly handles the absense of the PCAP environment variable,
which was broken in the previous change.
This commit is contained in:
Jakob Borg 2022-10-02 08:50:27 +02:00
parent 81bdde79ea
commit 7e848a150b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -20,7 +20,7 @@ RUN apk add --no-cache ca-certificates su-exec tzdata libcap
COPY --from=builder /src/syncthing /bin/syncthing COPY --from=builder /src/syncthing /bin/syncthing
COPY --from=builder /src/script/docker-entrypoint.sh /bin/entrypoint.sh COPY --from=builder /src/script/docker-entrypoint.sh /bin/entrypoint.sh
ENV PUID=1000 PGID=1000 HOME=/var/syncthing PCAP= ENV PUID=1000 PGID=1000 HOME=/var/syncthing
HEALTHCHECK --interval=1m --timeout=10s \ HEALTHCHECK --interval=1m --timeout=10s \
CMD nc -z 127.0.0.1 8384 || exit 1 CMD nc -z 127.0.0.1 8384 || exit 1

2
script/docker-entrypoint.sh
View File

@ -4,7 +4,7 @@ set -eu
if [ "$(id -u)" = '0' ]; then if [ "$(id -u)" = '0' ]; then
binary="$1" binary="$1"
if [ "$PCAP" == "" ] ; then if [ "${PCAP:-}" == "" ] ; then
# If Syncthing should have no extra capabilities, make sure to remove them # If Syncthing should have no extra capabilities, make sure to remove them
# from the binary. This will fail with an error if there are no # from the binary. This will fail with an error if there are no
# capabilities to remove, hence the || true etc. # capabilities to remove, hence the || true etc.