changelog

Update Radicale

.dockerignore

@@ -0,0 +1,3 @@
+*
+!/entrypoint.sh
+!/config

.github/workflows/docker.yml

@@ -11,12 +11,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Docker Labels
         id: meta
-        uses: crazy-max/ghaction-docker-meta@v2
+        uses: docker/metadata-action@v4
         with:
           images: cupcakearmy/radicale
           tags: |
@@ -24,16 +24,13 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
-        id: docker_build
+        uses: docker/build-push-action@v3
-        uses: docker/build-push-action@v2
         with:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}

CHANGELOG.md

@@ -5,16 +5,34 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.3] - 2022-12-01
+
+### Security
+
+- Updated Radicale version to `3.1.8`.
+
+## [1.0.3] - 2022-06-27
+
+### Security
+
+- Updated Radicale version to `3.1.7`.
+
+## [1.0.2] - 2022-02-07
+
+### Security
+
+- Updated dependencies.
+
 ## [1.0.1] - 2021-05-08
 
 ### Added
 
-- expose port
+- expose port.
 
 ## [1.0.0] - 2021-05-05
 
 ### Added
 
-- automated build & tagging
+- automated build & tagging.
-- arm images
+- arm images.
-- pinned Radicale to major version
+- pinned Radicale to major version.

Dockerfile

@@ -1,12 +1,14 @@
-FROM python:3.9-alpine as builder
+FROM python:3-alpine as builder
 
 WORKDIR /app
 
+ARG RADICALE_VERSION=3.1.8
+
 RUN apk add --no-cache alpine-sdk libffi-dev
-RUN pip install --user radicale[bcrypt]~=3.0
+RUN pip install --user radicale[bcrypt]==$RADICALE_VERSION
 
 
-FROM python:3.9-alpine
+FROM python:3-alpine
 
 RUN apk add --no-cache apache2-utils
 
@@ -24,4 +26,4 @@ VOLUME [ "/data" ]
 
 EXPOSE 5232
 
-CMD [ "/app/entrypoint.sh" ]
+CMD [ "/app/entrypoint.sh" ]

README.md

@@ -2,20 +2,21 @@
 
 This is a small docker image for [Radicale](https://github.com/Kozea/Radicale) and easy deployment. Bcrypt authentication inclusive.
 
-![docker pulls](https://badgen.net/docker/pulls/cupcakearmy/radicale)
+![Docker Pulls](https://img.shields.io/docker/pulls/cupcakearmy/radicale?style=flat-square)
-![docker size](https://badgen.net/docker/size/cupcakearmy/radicale)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/cupcakearmy/radicale/latest?style=flat-square)
+![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/cupcakearmy/radicale/latest?style=flat-square)
 
 ## Installation
 
-```
+```sh
 # .env
 USER=foo
 PASSWORD=secret
 ```
 
-```yml
+```yaml
 # docker-compose.yml
-version: '3.7'
+version: '3.8'
 
 services:
   app:
@@ -42,27 +43,27 @@ The same setup works for Calendar and on iOS.
 
 An example for traefik (v1) can found below.
 
-```yml
+```yaml
-version: '3.7'
+version: '3.8'
 
 networks:
-  traefik:
+  proxy:
     external: true
 
 services:
   app:
-    image: cupcakearmy/radicale
+    image: cupcakearmy/radicale:1
+    restart: unless-stopped
     env_file: .env
     volumes:
       - ./data:/data
     networks:
-      - traefik
+      - proxy
     labels:
       - traefik.enable=true
-      - traefik.backend=radicale
+      - traefik.http.routers.radicale.rule=Host(`radicale.example.org`)
-      - traefik.frontend.rule=Host:radicale.example.org
+      - traefik.http.routers.radicale.entrypoints=secure
-      - traefik.docker.network=traefik
+      - traefik.http.routers.radicale.tls.certresolver=le
-      - traefik.port=5232
 ```
 
 ## Customize

docker-compose.yml

@@ -1,4 +1,6 @@
-version: '3.7'
+# Only for development, see README.md for production
+
+version: '3.8'
 
 services:
   app: