From 149781968b9c9845159554e99efc9ea8fc4a4a66 Mon Sep 17 00:00:00 2001 From: surtur Date: Wed, 20 Oct 2021 00:07:54 +0200 Subject: [PATCH 1/3] bump fedora version to 35 also update README.md --- Dockerfile | 2 +- README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 31b2f4d..1f85d98 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.3 -FROM registry.fedoraproject.org/fedora-minimal:34 +FROM registry.fedoraproject.org/fedora:35 ARG BUILD_DATE ARG VCS_REF diff --git a/README.md b/README.md index e9a4bfa..f57eb3a 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,10 @@ The image is rebuilt nightly to ensure it always has the latest packages. development happens on [this Gitea instance](https://git.dotya.ml/wanderer/docker-fedora-cpp) ## What you get -* updated `registry.fedoraproject.org/fedora-minimal:34` image +* updated `registry.fedoraproject.org/fedora:35` image * the result of ```sh - dnf install -y \ + dnf install --nodocs -y \ git \ ninja-build \ make \ @@ -47,8 +47,8 @@ development happens on [this Gitea instance](https://git.dotya.ml/wanderer/docke autoconf \ pkgconf \ kernel-devel \ - numactl-{devel,libs} \ ncurses-{c++-libs,devel,libs,static} \ + numactl-{devel,libs} \ && dnf clean all -y ``` * compiled [`github.com/ntop/nDPI.git`](https://github.com/ntop/nDPI) -- 2.48.1 From 7c2214e3c1e508daaac71398f09fe523d8589bd4 Mon Sep 17 00:00:00 2001 From: surtur Date: Thu, 21 Oct 2021 01:15:51 +0200 Subject: [PATCH 2/3] switch to fedora-minimal use microdnf as a consequence --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1f85d98..1227d76 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.3 -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora-minimal:35 ARG BUILD_DATE ARG VCS_REF -- 2.48.1 From b37613c3aa6260740c92c6f49d517f2dc89e4020 Mon Sep 17 00:00:00 2001 From: surtur Date: Mon, 10 Jan 2022 01:46:21 +0100 Subject: [PATCH 3/3] chore: update README to reflect bump to f35 [skip ci] --- README.md | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f57eb3a..f257864 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,12 @@ The image is rebuilt nightly to ensure it always has the latest packages. development happens on [this Gitea instance](https://git.dotya.ml/wanderer/docker-fedora-cpp) ## What you get -* updated `registry.fedoraproject.org/fedora:35` image +* updated `registry.fedoraproject.org/fedora-minimal:35` image * the result of ```sh - dnf install --nodocs -y \ + microdnf install --nodocs dnf dnf-plugins-core -y && \ + dnf copr enable eddsalkield/iwyu -y && \ + microdnf install --nodocs --setopt install_weak_deps=0 -y \ git \ ninja-build \ make \ @@ -26,7 +28,14 @@ development happens on [this Gitea instance](https://git.dotya.ml/wanderer/docke libgcc \ libstdc++-{devel,static} \ glibc-devel \ + iwyu \ + cryptopp-devel \ + libasan-static \ + liblsan-static \ + libubsan-static \ + libtsan-static \ binutils \ + lld \ flex \ bison \ openmpi-devel \ @@ -49,7 +58,11 @@ development happens on [this Gitea instance](https://git.dotya.ml/wanderer/docke kernel-devel \ ncurses-{c++-libs,devel,libs,static} \ numactl-{devel,libs} \ - && dnf clean all -y + && dnf copr disable eddsalkield/iwyu \ + && rm -vf /etc/dnf/protected.d/dnf.conf \ + && microdnf remove dnf-plugins-core -y \ + && rpm --nodeps -e dnf \ + && microdnf clean all -y ``` * compiled [`github.com/ntop/nDPI.git`](https://github.com/ntop/nDPI) -- 2.48.1