Compare commits

..

No commits in common. "eb22f37654ff5cea586b08f3d928ba3a43533db7" and "8c323dd0d1fe56dc3db3edf50aa6f9437f980300" have entirely different histories.

10 changed files with 14 additions and 168 deletions

View File

@ -13,4 +13,4 @@ insert_final_newline = false
[*.yml]
indent_style = space
indent_size = 2
indent_size = 4

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
jupyter/jupyter
jupyter/notebooks

2
jupyter/.gitignore vendored
View File

@ -1,2 +0,0 @@
jupyter/
notebooks/

2
radicale/.gitignore vendored
View File

@ -1,2 +0,0 @@
data/
config/users

View File

@ -1,3 +0,0 @@
# Radicale Docker container
Based on [this](https://github.com/tomsquest/docker-radicale)

View File

@ -1,56 +0,0 @@
FROM alpine:3.14
ARG COMMIT_ID
ENV COMMIT_ID ${COMMIT_ID}
ARG VERSION
ENV VERSION ${VERSION:-3.1.8}
ARG BUILD_UID
ENV BUILD_UID ${BUILD_UID:-2999}
ARG BUILD_GID
ENV BUILD_GID ${BUILD_GID:-2999}
ARG TAKE_FILE_OWNERSHIP
ENV TAKE_FILE_OWNERSHIP ${TAKE_FILE_OWNERSHIP:-true}
LABEL maintainer="Mark <mark@betalupi.com>" \
org.label-schema.name="Radicale Docker Image" \
org.label-schema.description="Docker image for Radicale, the CalDAV/CardDAV server"
RUN apk add --no-cache --virtual=build-dependencies \
gcc \
musl-dev \
libffi-dev \
python3-dev \
&& apk add --no-cache \
curl \
git \
openssh \
shadow \
su-exec \
tzdata \
wget \
python3 \
py3-tz \
py3-pip \
&& python3 -m pip install --upgrade pip \
&& python3 -m pip install radicale==$VERSION passlib[bcrypt] \
&& apk del --purge build-dependencies \
&& addgroup -g $BUILD_GID radicale \
&& adduser -D -s /bin/false -H -u $BUILD_UID -G radicale radicale \
&& mkdir -p /config /data \
&& chmod -R 770 /data \
&& chown -R radicale:radicale /data \
&& rm -fr /root/.cache
COPY config /config/config
HEALTHCHECK --interval=30s --retries=3 CMD curl --fail http://localhost:5232 || exit 1
VOLUME /config /data
EXPOSE 5232
COPY start.sh /usr/local/bin
ENTRYPOINT ["/usr/local/bin/start.sh"]
CMD ["radicale", "--config", "/config/config"]

View File

@ -1,36 +0,0 @@
#!/bin/sh
set -e
# Change uid/gid of radicale if vars specified
if [ -n "$UID" ] || [ -n "$GID" ]; then
if [ ! "$UID" = "$(id radicale -u)" ] || [ ! "$GID" = "$(id radicale -g)" ]; then
# Fail on read-only container
if grep -e "\s/\s.*\sro[\s,]" /proc/mounts > /dev/null; then
echo "You specified custom UID/GID (UID: $UID, GID: $GID)."
echo "UID/GID can only be changed when not running the container with --read-only."
echo "Please see the README.md for how to proceed and for explanations."
exit 1
fi
if [ -n "$UID" ]; then
usermod -o -u "$UID" radicale
fi
if [ -n "$GID" ]; then
groupmod -o -g "$GID" radicale
fi
fi
fi
# If requested and running as root, mutate the ownership of bind-mounts
if [ "$(id -u)" = "0" ] && [ "$TAKE_FILE_OWNERSHIP" = "true" ]; then
chown -R radicale:radicale /data
fi
# Run radicale as the "radicale" user or any other command if provided
if [ "$(id -u)" = "0" ] && [ "$1" = "radicale" ]; then
exec su-exec radicale "$@"
else
exec "$@"
fi

View File

@ -1,20 +0,0 @@
[auth]
type = htpasswd
htpasswd_filename = /config/users
htpasswd_encryption = bcrypt
delay = 3
[rights]
type = owner_only
[server]
hosts = 0.0.0.0:5232
[web]
# type = none: disable web management
# type = internal: enable web management
type = internal
[storage]
type = multifilesystem
filesystem_folder = /data/collections

View File

@ -1,37 +0,0 @@
version: "3.7"
services:
radicale:
build:
context: ./build
args:
BUILD_UID: 1000
BUILD_GID: 1000
TAKE_FILE_OWNERSHIP: "false"
container_name: radicale
restart: unless-stopped
init: true
healthcheck:
test: curl -f http://127.0.0.1:5232 || exit 1
interval: 30s
retries: 3
# Security
read_only: true
security_opt:
- no-new-privileges:true
cap_drop:
- ALL
cap_add:
- SETUID
- SETGID
- KILL
ports:
- 5232:5232
volumes:
- ./data:/data
- ./config:/config

View File

@ -9,7 +9,7 @@ services:
volumes:
- "./stdata:/stdata"
- "./stconfig:/stconfig"
# host:container
ports:
- "8384:8384"
- "22067:22067"