Skip to content

Commit

Permalink
Fix: entrypoint.sh permissions
Browse files Browse the repository at this point in the history
  • Loading branch information
mbologna committed Nov 28, 2024
1 parent afac4af commit b52e5d6
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
9 changes: 4 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,13 @@ RUN touch /var/run/bitlbee.pid && chown bitlbee:nogroup /var/run/bitlbee.pid

EXPOSE 6667

USER bitlbee

# Define volumes for persistent data
VOLUME ["/var/lib/bitlbee"]

# Needed for VOLUME permissions
COPY entrypoint.sh /entrypoint.sh
RUN chmod +x entrypoint.sh

# Define volumes for persistent data
VOLUME ["/var/lib/bitlbee"]
USER bitlbee
ENTRYPOINT ["/entrypoint.sh"]

CMD ["/usr/local/sbin/bitlbee", "-D", "-n", "-v", "-u", "bitlbee"]
9 changes: 7 additions & 2 deletions entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
#!/bin/bash
set -euxo pipefail
# Ensure proper permissions on the mounted data directory
# Debug log for ownership check
echo "Current owner of /var/lib/bitlbee: $(stat -c %U /var/lib/bitlbee)"

if [ "$(stat -c %U /var/lib/bitlbee)" != "bitlbee" ]; then
chown -R bitlbee:nogroup /var/lib/bitlbee
echo "Changing ownership of /var/lib/bitlbee to bitlbee"
chown -R bitlbee:nogroup /var/lib/bitlbee || echo "Failed to change ownership"
else
echo "Ownership is already correct"
fi
exec "$@"
2 changes: 2 additions & 0 deletions k8s/bitlbee-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ spec:
labels:
app: bitlbee
spec:
securityContext:
fsGroup: 1001 # Needed for volume permissions
containers:
- name: bitlbee
image: docker.io/mbologna/docker-bitlbee:latest
Expand Down

0 comments on commit b52e5d6

Please sign in to comment.