Fix syslogd not running in Debian (instrumentisto/opendkim-docker-i…

…mage#6)
instrumentisto · Oct 4, 2022 · e3673bd · e3673bd
1 parent 93ac5c9
commit e3673bd
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,20 @@ All user visible changes to this project will be documented in this file. This p
 
 
 
+## [1.4.2-r14] · 2022-10-04
+[1.4.2-r14]: /../../tree/1.4.2-r14
+
+[Diff](/../../compare/1.4.2-r13...1.4.2-r14)
+
+### Fixed
+
+- `syslogd` not running in [Debian]. ([instrumentisto/opendkim-docker-image#6])
+
+[instrumentisto/opendkim-docker-image#6]: https://github.com/instrumentisto/opendkim-docker-image/issues/6
+
+
+
+
 ## [1.4.2-r13] · 2022-08-30
 [1.4.2-r13]: /../../tree/1.4.2-r13
 

diff --git a/Dockerfile.tmpl.php b/Dockerfile.tmpl.php
@@ -144,6 +144,11 @@
          https://github.com/just-containers/s6-overlay/releases/download/v${s6_overlay_ver}/s6-overlay-x86_64.tar.xz \
  && tar -xf /tmp/s6-overlay-noarch.tar.xz -C / \
  && tar -xf /tmp/s6-overlay-bin.tar.xz -C / \
+<? if (!$isAlpineImage) { ?>
+    \
+ # Fix syslogd path
+ && ln -s /usr/sbin/syslogd /sbin/syslogd \
+<? } ?>
     \
  # Cleanup unnecessary stuff
 <? if ($isAlpineImage) { ?>

diff --git a/Makefile b/Makefile
@@ -23,8 +23,8 @@ REGISTRIES := $(strip $(subst $(comma), ,\
 	$(shell grep -m1 'registry: \["' .github/workflows/ci.yml \
 	        | cut -d':' -f2 | tr -d '"][')))
 ALL_IMAGES := \
-	debian:1.4.2-r13,1.4.2,1.4,1,latest \
-	alpine:1.4.2-r13-alpine,1.4.2-alpine,1.4-alpine,1-alpine,alpine
+	debian:1.4.2-r14,1.4.2,1.4,1,latest \
+	alpine:1.4.2-r14-alpine,1.4.2-alpine,1.4-alpine,1-alpine,alpine
 #	<Dockerfile>:<version>,<tag1>,<tag2>,...
 
 # Default is first image from ALL_IMAGES list.

diff --git a/README.md b/README.md
@@ -17,8 +17,8 @@ OpenDMARC Docker image
 
 ## Supported tags and respective `Dockerfile` links
 
-- [`1.4.2-r13`, `1.4.2`, `1.4`, `1`, `latest`][101]
-- [`1.4.2-r13-alpine`, `1.4.2-alpine`, `1.4-alpine`, `1-alpine`, `alpine`][102]
+- [`1.4.2-r14`, `1.4.2`, `1.4`, `1`, `latest`][101]
+- [`1.4.2-r14-alpine`, `1.4.2-alpine`, `1.4-alpine`, `1-alpine`, `alpine`][102]
 
 
 

diff --git a/debian/Dockerfile b/debian/Dockerfile
@@ -89,6 +89,9 @@ RUN apt-get update \
  && tar -xf /tmp/s6-overlay-noarch.tar.xz -C / \
  && tar -xf /tmp/s6-overlay-bin.tar.xz -C / \
     \
+ # Fix syslogd path
+ && ln -s /usr/sbin/syslogd /sbin/syslogd \
+    \
  # Cleanup unnecessary stuff
  && apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \

diff --git a/tests/main.bats b/tests/main.bats
@@ -52,3 +52,10 @@
         'opendmarc && sleep 10 && ls /run/opendmarc/another-one.pid'
   [ "$status" -eq 0 ]
 }
+
+
+@test "syslogd: runs ok" {
+  run docker run --rm --entrypoint sh $IMAGE -c \
+    '/sbin/syslogd --help'
+  [ "$status" -eq 0 ]
+}