From 4e5a32c210a8aeeb78b0b063529ad3691225b05a Mon Sep 17 00:00:00 2001 From: abraunegg Date: Tue, 18 Apr 2023 12:40:05 +1000 Subject: [PATCH] Update to Fedora Docker file to use Fedora 37 to resolve current vulnerabilities (#2383) * Update to use Docker build to use Fedora 37 * Update golang to 1.20 --- contrib/docker/Dockerfile | 7 +++++-- docs/Docker.md | 4 ++-- docs/Podman.md | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index d1157fa3..c30167b2 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -1,8 +1,8 @@ # -*-Dockerfile-*- -ARG FEDORA_VERSION=36 +ARG FEDORA_VERSION=37 ARG DEBIAN_VERSION=bullseye -ARG GO_VERSION=1.17 +ARG GO_VERSION=1.20 ARG GOSU_VERSION=1.14 FROM golang:${GO_VERSION}-${DEBIAN_VERSION} AS builder-gosu @@ -25,6 +25,9 @@ RUN ./configure \ FROM fedora:${FEDORA_VERSION} +RUN dnf clean all \ + && dnf -y update + RUN dnf install -y libcurl sqlite ldc-libs \ && dnf clean all \ && mkdir -p /onedrive/conf /onedrive/data diff --git a/docs/Docker.md b/docs/Docker.md index 7eadc2e5..2a56f880 100644 --- a/docs/Docker.md +++ b/docs/Docker.md @@ -9,8 +9,8 @@ This client can be run as a Docker container, with 3 available container base op | 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 |❌|✔|❌|✔| +| Fedora | edge-fedora | Docker container based on Fedora 37 using 'master' |❌|✔|❌|✔| +| Fedora | fedora | Docker container based on Fedora 37 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 f480207f..a38c95bd 100644 --- a/docs/Podman.md +++ b/docs/Podman.md @@ -9,8 +9,8 @@ This client can be run as a Podman container, with 3 available container base op | 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 |❌|✔|❌|✔| +| Fedora | edge-fedora | Podman container based on Fedora 37 using 'master' |❌|✔|❌|✔| +| Fedora | fedora | Podman container based on Fedora 37 using latest release |❌|✔|❌|✔| These containers offer a simple monitoring-mode service for the OneDrive Client for Linux.