From 626b8e2a36ff900c98fe131dcc459eb24bed28dc Mon Sep 17 00:00:00 2001 From: Jakub Kadlcik Date: Sat, 23 Nov 2024 20:58:50 +0100 Subject: [PATCH] docker: upgrade containers for local development to F41 See #3460 Several issues appeared during the upgrade, and we are addressing them here: - To my dismay, `python3-ipdb` is not available on F41. See https://bugzilla.redhat.com/show_bug.cgi?id=2280968 Hopefully, the upstream issue will get fixed and the pacakge will get unretired in Fedora. I love using it. - The `dist-git-client` is not a part of Copr codebase anymore and it was moved to dist-git. See https://github.com/release-engineering/dist-git As a consequence, the name of the configuration directory changed. - Removing mlocate. We discussed it several times and IIRC we don't need it Also, please recreate the whole environment through `docker-compose down --rmi all --volumes` and `docker-compose up -d`. --- docker/backend/Dockerfile | 4 +--- docker/builder/Dockerfile | 3 +-- .../etc/{copr-distgit-client => dist-git-client}/docker.ini | 0 docker/distgit/Dockerfile | 3 +-- docker/frontend/Dockerfile | 3 +-- docker/keygen/Dockerfile | 2 +- docker/resalloc/Dockerfile | 2 +- 7 files changed, 6 insertions(+), 11 deletions(-) rename docker/builder/files/etc/{copr-distgit-client => dist-git-client}/docker.ini (100%) diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 5ced0c310..da353f113 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:39 +FROM registry.fedoraproject.org/fedora:41 MAINTAINER copr-devel@lists.fedorahosted.org ARG ADDITIONAL_COPR_REPOSITORIES="@copr/copr-dev" @@ -22,14 +22,12 @@ RUN set -ex ; \ net-tools \ iputils \ vim \ - mlocate \ git \ sudo \ openssh-server \ resalloc \ psmisc \ nginx \ - python3-ipdb \ findutils \ tini \ # to get more entropy for generation of gpg keys diff --git a/docker/builder/Dockerfile b/docker/builder/Dockerfile index 45d215dca..0d049f8d7 100644 --- a/docker/builder/Dockerfile +++ b/docker/builder/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:39 +FROM registry.fedoraproject.org/fedora:41 MAINTAINER copr-devel@lists.fedorahosted.org ARG ADDITIONAL_COPR_REPOSITORIES="@copr/copr-dev" @@ -16,7 +16,6 @@ RUN set -ex ; \ which \ wget \ vim \ - python3-ipdb \ # builder packages openssh-server \ fedora-packager \ diff --git a/docker/builder/files/etc/copr-distgit-client/docker.ini b/docker/builder/files/etc/dist-git-client/docker.ini similarity index 100% rename from docker/builder/files/etc/copr-distgit-client/docker.ini rename to docker/builder/files/etc/dist-git-client/docker.ini diff --git a/docker/distgit/Dockerfile b/docker/distgit/Dockerfile index f4720d128..769195923 100644 --- a/docker/distgit/Dockerfile +++ b/docker/distgit/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:39 +FROM registry.fedoraproject.org/fedora:41 MAINTAINER copr-devel@lists.fedorahosted.org ARG ADDITIONAL_COPR_REPOSITORIES="@copr/copr-dev" @@ -19,7 +19,6 @@ RUN set -ex ; \ vim \ cgit \ python3-rpkg \ - python3-ipdb \ tini \ && \ dnf -y install copr-dist-git && \ diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index 69d51321b..1e518ccbe 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:39 +FROM registry.fedoraproject.org/fedora:41 MAINTAINER copr-devel@lists.fedorahosted.org ARG ADDITIONAL_COPR_REPOSITORIES="@copr/copr-dev" @@ -22,7 +22,6 @@ RUN set -ex ; \ yum \ sudo \ python3-alembic \ - python3-ipdb \ python3-anytree \ postgresql-server \ redis \ diff --git a/docker/keygen/Dockerfile b/docker/keygen/Dockerfile index c17502b45..85bdc6ccf 100644 --- a/docker/keygen/Dockerfile +++ b/docker/keygen/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:39 +FROM registry.fedoraproject.org/fedora:41 MAINTAINER copr-devel@lists.fedorahosted.org diff --git a/docker/resalloc/Dockerfile b/docker/resalloc/Dockerfile index d3657504b..233ca22f4 100644 --- a/docker/resalloc/Dockerfile +++ b/docker/resalloc/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:39 +FROM registry.fedoraproject.org/fedora:41 MAINTAINER copr-devel@lists.fedorahosted.org # Deployment instructions are described here