pidfile now is handled correctly in solanum container and small fix in build stage

master
Meliurwen 3 years ago
parent d4167aa0aa
commit 189bf9c644
Signed by: meliurwen
GPG Key ID: 818A8B35E9F1CE10
  1. 3
      solanum/Dockerfile
  2. 22
      solanum/root/entrypoint.sh

@ -34,7 +34,8 @@ RUN ./configure \
RUN apk add \ RUN apk add \
util-linux util-linux
RUN make -j${MK_THREADS:-$(nproc)} && \ RUN make -j${MK_THREADS:-$(nproc)} && \
make install make install && \
mv /srv/data/* /srv/solanum/
FROM alpine:latest FROM alpine:latest

@ -1,5 +1,7 @@
#!/bin/sh #!/bin/sh
set -e
mkdir -p /srv/data/etc /srv/data/logs mkdir -p /srv/data/etc /srv/data/logs
chown solanum:solanum -R /srv/data/logs chown solanum:solanum -R /srv/data/logs
@ -7,7 +9,27 @@ chown solanum:solanum -R /srv/data/logs
cp -n -p /srv/solanum/etc/ircd.conf.example /srv/data/etc/ircd.conf cp -n -p /srv/solanum/etc/ircd.conf.example /srv/data/etc/ircd.conf
cp -n -p /srv/solanum/etc/ircd.motd /srv/data/etc/ircd.motd cp -n -p /srv/solanum/etc/ircd.motd /srv/data/etc/ircd.motd
# Usage: solanum [options]
# Where valid options are:
# -configfile <string> File to use for ircd.conf
# -logfile <string> File to use for ircd.log
# -pidfile <string> File to use for process ID
# -foreground Run in foreground (don't detach)
# -version Print version and exit
# -conftest Test the configuration files and exit
# -help Print this text
rm -f /srv/solanum/ircd.pid
# Validate the configuration first
# Note: ehm... it returns exit code 0 regardless of the result??
#su solanum \
# -c "/srv/solanum/bin/solanum \
# -pidfile /srv/solanum/ircd.pid \
# -conftest"
su solanum \ su solanum \
-c "/srv/solanum/bin/solanum \ -c "/srv/solanum/bin/solanum \
-pidfile /srv/solanum/ircd.pid \
-foreground \ -foreground \
$*" $*"

Loading…
Cancel
Save