diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..b44be30 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +* +!/entrypoint.sh +!/config diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a64e51c..240837f 100644 --- a/.github/workflows/docker.yml +++ b/.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@v2 + uses: docker/build-push-action@v3 with: platforms: linux/amd64,linux/arm64 push: true tags: ${{ steps.meta.outputs.tags }} - - name: Image digest - run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 8300ae1..4a971ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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-06-27 + +### Security + +- Updated Radicale version to `3.1.7`. + ## [1.0.2] - 2022-02-07 ### Security diff --git a/Dockerfile b/Dockerfile index 127c0bd..982424f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM python:3-alpine as builder WORKDIR /app -ARG RADICALE_VERSION=3.1.4 +ARG RADICALE_VERSION=3.1.7 RUN apk add --no-cache alpine-sdk libffi-dev RUN pip install --user radicale[bcrypt]==$RADICALE_VERSION diff --git a/README.md b/README.md index ea7c8d0..43903f8 100644 --- a/README.md +++ b/README.md @@ -7,15 +7,15 @@ This is a small docker image for [Radicale](https://github.com/Kozea/Radicale) a ## Installation -``` +```sh # .env USER=foo PASSWORD=secret ``` -```yml +```yaml # docker-compose.yml -version: '3.7' +version: '3.8' services: app: @@ -42,27 +42,27 @@ The same setup works for Calendar and on iOS. An example for traefik (v1) can found below. -```yml -version: '3.7' +```yaml +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.frontend.rule=Host:radicale.example.org - - traefik.docker.network=traefik - - traefik.port=5232 + - traefik.http.routers.radicale.rule=Host(`radicale.example.org`) + - traefik.http.routers.radicale.entrypoints=secure + - traefik.http.routers.radicale.tls.certresolver=le ``` ## Customize diff --git a/docker-compose.yml b/docker-compose.yml index 346b16d..735475b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,6 @@ -version: '3.7' +# Only for development, see README.md for production + +version: '3.8' services: app: