mirror of
https://github.com/rustmailer/bichon.git
synced 2026-08-03 07:48:34 +02:00
fix: allow setting of PUID and PGID to prevent permission issues when using NFS mounts or shared volumes
This commit is contained in:
+6
-1
@@ -17,6 +17,10 @@ COPY ${TARGETARCH}/LICENSE /opt/bichon/
|
||||
# Set proper permissions
|
||||
RUN chmod +x /opt/bichon/bichon
|
||||
|
||||
# Copy and setup entrypoint script for PUID/PGID support
|
||||
COPY docker/entrypoint.sh /usr/local/bin/entrypoint.sh
|
||||
RUN chmod +x /usr/local/bin/entrypoint.sh
|
||||
|
||||
# Install ca-certificates to ensure HTTPS certificate verification works correctly
|
||||
RUN apt update && apt install -y ca-certificates curl && rm -rf /var/lib/apt/lists/*
|
||||
# Create data directory
|
||||
@@ -31,5 +35,6 @@ WORKDIR /data
|
||||
HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 \
|
||||
CMD curl -fs http://localhost:15630/api/status || exit 1
|
||||
|
||||
# Entrypoint remains the binary
|
||||
# Entrypoint with PUID/PGID support
|
||||
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
|
||||
CMD ["/opt/bichon/bichon"]
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Entrypoint script for Bichon Docker container
|
||||
# Handles PUID/PGID environment variables for proper user permissions
|
||||
|
||||
set -e
|
||||
|
||||
# Function to create user and switch to it
|
||||
switch_user() {
|
||||
local puid="$1"
|
||||
local pgid="$2"
|
||||
|
||||
# Create group if it doesn't exist
|
||||
if ! getent group bichon >/dev/null 2>&1; then
|
||||
groupadd -g "$pgid" bichon
|
||||
fi
|
||||
|
||||
# Create user if it doesn't exist
|
||||
if ! getent passwd bichon >/dev/null 2>&1; then
|
||||
useradd -u "$puid" -g "$pgid" -s /bin/bash -d /data bichon
|
||||
fi
|
||||
|
||||
# Change ownership of directories that the process needs to write to
|
||||
chown -R "$puid:$pgid" /data
|
||||
chown -R "$puid:$pgid" /opt/bichon
|
||||
# Handle mounted storage directories if they exist
|
||||
[ -d /envelope ] && chown -R "$puid:$pgid" /envelope
|
||||
[ -d /eml ] && chown -R "$puid:$pgid" /eml
|
||||
|
||||
# Switch to the user and execute the command
|
||||
exec runuser -u bichon -- "$@"
|
||||
}
|
||||
|
||||
# Check if PUID and PGID are set
|
||||
if [ -n "$PUID" ] && [ -n "$PGID" ]; then
|
||||
echo "Switching to user with PUID=$PUID, PGID=$PGID"
|
||||
switch_user "$PUID" "$PGID" "$@"
|
||||
else
|
||||
echo "No PUID/PGID specified, running as root"
|
||||
exec "$@"
|
||||
fi
|
||||
Reference in New Issue
Block a user