Skip to content

Commit

Permalink
doc: merge the two podman instructions
Browse files Browse the repository at this point in the history
  • Loading branch information
tomsquest committed Feb 4, 2024
1 parent c98160f commit 631fcf8
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ Enhanced Docker image for <a href="http://radicale.org">Radicale</a>, the CalDAV
- [Custom configuration](#custom-configuration)
- [Volumes versus Bind-Mounts](#volumes-versus-bind-mounts)
- [Running with Docker compose](#running-with-docker-compose)
- [Running with Podman](#running-with-podman)
- [Multi-architecture](#multi-architecture)
- [Extending the image](#extending-the-image)
- [Versioning with Git](#versioning-with-git)
Expand All @@ -37,8 +36,8 @@ Enhanced Docker image for <a href="http://radicale.org">Radicale</a>, the CalDAV
- [Option 1: Create a user/group with id `2999` on the host](#option-1-create-a-usergroup-with-id-2999-on-the-host)
- [Option 2: Force the user/group ids on `docker run`](#option-2-force-the-usergroup-ids-on-docker-run)
- [Option 3: Build the image with a custom user/group](#option-3-build-the-image-with-a-custom-usergroup)
- [Podman](#podman)
- [Tags](#tags)
- [Running with Podman](#running-with-podman)
- [Contributing](#contributing)
- [Releasing](#releasing)
- [Contributors](#contributors)
Expand Down Expand Up @@ -140,10 +139,6 @@ A [Docker compose file](docker-compose.yml) is included.
It can also be [extended](https://docs.docker.com/compose/production/#modify-your-compose-file-for-production).
Make sure you have Docker compose version 2 or higher.

## Running with Podman

[Greylinux](https://github.com/Greylinux) has written [some instructions](https://github.com/tomsquest/docker-radicale/issues/122#issuecomment-1361240992) to run the image with Podman.

## Multi-architecture

The correct image type for your architecture will be automatically selected by Docker, whether it is amd64 or arm64.
Expand Down Expand Up @@ -235,10 +230,6 @@ Usage: `docker build --build-arg=BUILD_UID=5000 --build-arg=BUILD_GID=5001 ...`.

`BUILD_UID` and `BUILD_GID` are also supported as environment variables to work around a problem on some Synology NAS. See this PR#68.

## Podman

[@strauss115](https://github.com/strauss115) has made [some instructions](https://github.com/tomsquest/docker-radicale/issues/122#issuecomment-1874607285) to run the image with Podman.

## Tags

The image is tagged with this scheme:
Expand All @@ -254,6 +245,12 @@ Example:
The last number is **ours**, and it is incremented on new release.
For example, 2.1.11.**2** made the /config readonly (this is specific to this image).

## Running with Podman

Two users have given the instructions they used to run the image with Podman:
- [@greylinux's instructions](https://github.com/tomsquest/docker-radicale/issues/122#issuecomment-1361240992)
- [@strauss115's instructions](https://github.com/tomsquest/docker-radicale/issues/122#issuecomment-1874607285)

## Contributing

To run the tests:
Expand Down

0 comments on commit 631fcf8

Please sign in to comment.