From f5edb8b394a046e0db9c2561b31c1574ed221efa Mon Sep 17 00:00:00 2001 From: abraunegg Date: Wed, 21 Jun 2023 12:59:46 +1000 Subject: [PATCH] Update Docker files June 2023 (#2438) * Update Docker Files June 2023 and Documentation --- .github/workflows/docker.yaml | 4 ++++ contrib/docker/Dockerfile | 2 +- contrib/docker/Dockerfile-alpine | 2 +- contrib/docker/Dockerfile-debian | 10 ++++++---- docs/Docker.md | 16 ++++++++-------- docs/Podman.md | 16 ++++++++-------- 6 files changed, 28 insertions(+), 22 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index a3af6670..7849cb6b 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -5,6 +5,7 @@ on: branches: [ master ] tags: [ 'v*' ] pull_request: + # Comment these out to force a test build on a PR branches: - master types: [closed] @@ -14,7 +15,10 @@ env: jobs: build: + # Comment this out to force a test build on a PR if: (!(github.event.action == 'closed' && github.event.pull_request.merged != true)) + + # Build runs on runs-on: ubuntu-latest strategy: diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index c3616b77..fca95731 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -1,6 +1,6 @@ # -*-Dockerfile-*- -ARG FEDORA_VERSION=37 +ARG FEDORA_VERSION=38 ARG DEBIAN_VERSION=bullseye ARG GO_VERSION=1.20 ARG GOSU_VERSION=1.16 diff --git a/contrib/docker/Dockerfile-alpine b/contrib/docker/Dockerfile-alpine index 21993e49..4db39a69 100644 --- a/contrib/docker/Dockerfile-alpine +++ b/contrib/docker/Dockerfile-alpine @@ -1,6 +1,6 @@ # -*-Dockerfile-*- -ARG ALPINE_VERSION=3.17 +ARG ALPINE_VERSION=3.18 ARG GO_VERSION=1.20 ARG GOSU_VERSION=1.16 diff --git a/contrib/docker/Dockerfile-debian b/contrib/docker/Dockerfile-debian index 906ba4aa..a4cae5a4 100644 --- a/contrib/docker/Dockerfile-debian +++ b/contrib/docker/Dockerfile-debian @@ -1,10 +1,11 @@ # -*-Dockerfile-*- -ARG DEBIAN_VERSION=bullseye +ARG DEBIAN_VERSION=stable FROM debian:${DEBIAN_VERSION} AS builder-onedrive -RUN apt-get update \ +RUN apt-get clean \ + && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends build-essential curl ca-certificates libcurl4-openssl-dev libsqlite3-dev libxml2-dev pkg-config git ldc \ && rm -rf /var/lib/apt/lists/* @@ -18,9 +19,10 @@ RUN ./configure DC=/usr/bin/ldmd2 \ FROM debian:${DEBIAN_VERSION}-slim -RUN apt-get update \ +RUN apt-get clean \ + && apt-get update \ && apt-get upgrade -y \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gosu libcurl4 libsqlite3-0 ca-certificates libphobos2-ldc-shared94 \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gosu libcurl4 libsqlite3-0 ca-certificates libphobos2-ldc-shared100 \ && rm -rf /var/lib/apt/lists/* \ # Fix bug with ssl on armhf: https://serverfault.com/a/1045189 && /usr/bin/c_rehash \ diff --git a/docs/Docker.md b/docs/Docker.md index ef028305..6c555f83 100644 --- a/docs/Docker.md +++ b/docs/Docker.md @@ -3,14 +3,14 @@ This client can be run as a Docker container, with 3 available container base op | 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 37 using 'master' |❌|✔|❌|✔| -| Fedora | fedora | Docker container based on Fedora 37 using latest release |❌|✔|❌|✔| +| Alpine Linux | edge-alpine | Docker container based on Alpine 3.18 using 'master' |❌|✔|❌|✔| +| Alpine Linux | alpine | Docker container based on Alpine 3.18 using latest release |❌|✔|❌|✔| +| Debian | debian | Docker container based on Debian Stable using latest release |✔|✔|✔|✔| +| Debian | edge | Docker container based on Debian Stable using 'master' |✔|✔|✔|✔| +| Debian | edge-debian | Docker container based on Debian Stable using 'master' |✔|✔|✔|✔| +| Debian | latest | Docker container based on Debian Stable using latest release |✔|✔|✔|✔| +| Fedora | edge-fedora | Docker container based on Fedora 38 using 'master' |❌|✔|❌|✔| +| Fedora | fedora | Docker container based on Fedora 38 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 a38c95bd..c17c5411 100644 --- a/docs/Podman.md +++ b/docs/Podman.md @@ -3,14 +3,14 @@ This client can be run as a Podman container, with 3 available container base op | 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 37 using 'master' |❌|✔|❌|✔| -| Fedora | fedora | Podman container based on Fedora 37 using latest release |❌|✔|❌|✔| +| Alpine Linux | edge-alpine | Podman container based on Alpine 3.18 using 'master' |❌|✔|❌|✔| +| Alpine Linux | alpine | Podman container based on Alpine 3.18 using latest release |❌|✔|❌|✔| +| Debian | debian | Podman container based on Debian Stable using latest release |✔|✔|✔|✔| +| Debian | edge | Podman container based on Debian Stable using 'master' |✔|✔|✔|✔| +| Debian | edge-debian | Podman container based on Debian Stable using 'master' |✔|✔|✔|✔| +| Debian | latest | Podman container based on Debian Stable using latest release |✔|✔|✔|✔| +| Fedora | edge-fedora | Podman container based on Fedora 38 using 'master' |❌|✔|❌|✔| +| Fedora | fedora | Podman container based on Fedora 38 using latest release |❌|✔|❌|✔| These containers offer a simple monitoring-mode service for the OneDrive Client for Linux.