From 3aa191e3e408f95640c1c7ea49bb6e7857367fde Mon Sep 17 00:00:00 2001 From: abraunegg Date: Thu, 6 Apr 2023 07:45:14 +1000 Subject: [PATCH] Update Docker and Podman documents and clarify i386|i686 support (#2370) * Update Docker and Podman documents clarifying i386|i686 compatibility * Add building Linux/386 Docker images given that Debian have a compatible LCD version for i386|i686 --- .github/workflows/docker.yaml | 2 +- docs/Docker.md | 22 +++++++++++----------- docs/Podman.md | 22 ++++++++++++++++------ 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index b8f620c4..a3af6670 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -26,7 +26,7 @@ jobs: platforms: linux/amd64,linux/arm64 - flavor: debian dockerfile: ./contrib/docker/Dockerfile-debian - platforms: linux/amd64,linux/arm64,linux/arm/v7 + platforms: linux/386,linux/amd64,linux/arm64,linux/arm/v7 - flavor: alpine dockerfile: ./contrib/docker/Dockerfile-alpine platforms: linux/amd64,linux/arm64 diff --git a/docs/Docker.md b/docs/Docker.md index e6da40e8..7eadc2e5 100644 --- a/docs/Docker.md +++ b/docs/Docker.md @@ -1,16 +1,16 @@ # Run the OneDrive Client for Linux under Docker -This client can be run as a Docker container, with 3 available options for you to choose from: +This client can be run as a Docker container, with 3 available container base options for you to choose from: -| Container Base | Docker Tag | Description | x86_64 | ARMHF | AARCH64 | -|----------------|-------------|----------------------------------------------------------------|:------:|:-----:|:-------:| -| Alpine Linux | edge-alpine | Docker container based on Alpine 3.17 using 'master' |✔|❌|✔| -| Alpine Linux | alpine | Docker container based on Alpine 3.17 using latest release |✔|❌|✔| -| Debian | debian | Docker container based on Debian Bullseye using latest release |✔|✔|✔| -| Debian | edge | Docker container based on Debian Bullseye using 'master' |✔|✔|✔| -| Debian | edge-debian | Docker container based on Debian Bullseye using 'master' |✔|✔|✔| -| Debian | latest | Docker container based on Debian Bullseye using latest release |✔|✔|✔| -| Fedora | edge-fedora | Docker container based on Fedora 36 using 'master' |✔|❌|✔| -| Fedora | fedora | Docker container based on Fedora 36 using latest release |✔|❌|✔| +| Container Base | Docker Tag | Description | i686 | x86_64 | ARMHF | AARCH64 | +|----------------|-------------|----------------------------------------------------------------|:------:|:------:|:-----:|:-------:| +| Alpine Linux | edge-alpine | Docker container based on Alpine 3.17 using 'master' |❌|✔|❌|✔| +| Alpine Linux | alpine | Docker container based on Alpine 3.17 using latest release |❌|✔|❌|✔| +| Debian | debian | Docker container based on Debian Bullseye using latest release |✔|✔|✔|✔| +| Debian | edge | Docker container based on Debian Bullseye using 'master' |✔|✔|✔|✔| +| Debian | edge-debian | Docker container based on Debian Bullseye using 'master' |✔|✔|✔|✔| +| Debian | latest | Docker container based on Debian Bullseye using latest release |✔|✔|✔|✔| +| Fedora | edge-fedora | Docker container based on Fedora 36 using 'master' |❌|✔|❌|✔| +| Fedora | fedora | Docker container based on Fedora 36 using latest release |❌|✔|❌|✔| These containers offer a simple monitoring-mode service for the OneDrive Client for Linux. diff --git a/docs/Podman.md b/docs/Podman.md index 256309b7..f480207f 100644 --- a/docs/Podman.md +++ b/docs/Podman.md @@ -1,17 +1,27 @@ # Run the OneDrive Client for Linux under Podman -This client can be run as a Podman container, with 3 available options for you to choose from: -1. Container based on Fedora 36 - Docker Tag: latest -2. Container based on Debian 11 - Docker Tag: debian -3. Container based on Alpine Linux - Docker Tag: alpine +This client can be run as a Podman container, with 3 available container base options for you to choose from: + +| Container Base | Docker Tag | Description | i686 | x86_64 | ARMHF | AARCH64 | +|----------------|-------------|----------------------------------------------------------------|:------:|:------:|:-----:|:-------:| +| Alpine Linux | edge-alpine | Podman container based on Alpine 3.17 using 'master' |❌|✔|❌|✔| +| Alpine Linux | alpine | Podman container based on Alpine 3.17 using latest release |❌|✔|❌|✔| +| Debian | debian | Podman container based on Debian Bullseye using latest release |✔|✔|✔|✔| +| Debian | edge | Podman container based on Debian Bullseye using 'master' |✔|✔|✔|✔| +| Debian | edge-debian | Podman container based on Debian Bullseye using 'master' |✔|✔|✔|✔| +| Debian | latest | Podman container based on Debian Bullseye using latest release |✔|✔|✔|✔| +| Fedora | edge-fedora | Podman container based on Fedora 36 using 'master' |❌|✔|❌|✔| +| Fedora | fedora | Podman container based on Fedora 36 using latest release |❌|✔|❌|✔| These containers offer a simple monitoring-mode service for the OneDrive Client for Linux. The instructions below have been validated on: * Fedora 35 -The instructions below will utilise the 'latest' tag, however this can be substituted for 'debian' or 'alpine' if desired. The below instructions for podman have only been tested as the root user while running the containers themselves as non-root users. +The instructions below will utilise the 'latest' tag, however this can be substituted for any of the other docker tags from the table above if desired. -**Note:** If you are using Debian or Ubuntu platforms, it is recommended you use the 'debian' Docker tag rather than 'latest' to ensure maximum compatability with your Debian or Ubuntu ecosystem. +Additionally there are specific version release tags for each release. Refer to https://hub.docker.com/r/driveone/onedrive/tags for any other Docker tags you may be interested in. + +**Note:** The below instructions for podman have only been tested as the root user while running the containers themselves as non-root users. ## Basic Setup ### 0. Install podman using your distribution platform's instructions if not already installed