From 0ad56f66271ba0e0658f093870085f88907382b4 Mon Sep 17 00:00:00 2001 From: Steven Koo Date: Sun, 22 Aug 2021 22:50:30 -0500 Subject: [PATCH] ci: Add Fedora 34 and remove Fedora 32 Fedora 34 has been released and Fedora 32 is EOL Signed-off-by: Steven Koo --- ...er-fedora32.Dockerfile => uhd-builder-fedora34.Dockerfile} | 2 +- .ci/uhd-build-docker-container.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename .ci/docker/{uhd-builder-fedora32.Dockerfile => uhd-builder-fedora34.Dockerfile} (98%) diff --git a/.ci/docker/uhd-builder-fedora32.Dockerfile b/.ci/docker/uhd-builder-fedora34.Dockerfile similarity index 98% rename from .ci/docker/uhd-builder-fedora32.Dockerfile rename to .ci/docker/uhd-builder-fedora34.Dockerfile index e495364c9..be2a92cd5 100644 --- a/.ci/docker/uhd-builder-fedora32.Dockerfile +++ b/.ci/docker/uhd-builder-fedora34.Dockerfile @@ -1,7 +1,7 @@ # please follow docker best practices # https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/ -FROM fedora:32 +FROM fedora:34 LABEL maintainer="Ettus Research" RUN dnf install -y \ diff --git a/.ci/uhd-build-docker-container.yml b/.ci/uhd-build-docker-container.yml index 0a876e9fb..fc0497cac 100644 --- a/.ci/uhd-build-docker-container.yml +++ b/.ci/uhd-build-docker-container.yml @@ -38,8 +38,8 @@ variables: - template: uhd-pipeline-vars.yml - name: linuxDockerImages value: - "{'Fedora-32-builder':{'dockerOSName':'fedora32','dockerImageName':'uhd-builder-fedora32'}, - 'Fedora-33-builder':{'dockerOSName':'fedora33','dockerImageName':'uhd-builder-fedora33'}, + "{'Fedora-33-builder':{'dockerOSName':'fedora33','dockerImageName':'uhd-builder-fedora33'}, + 'Fedora-34-builder':{'dockerOSName':'fedora34','dockerImageName':'uhd-builder-fedora34'}, 'Ubuntu-1804-builder':{'dockerOSName':'ubuntu1804','dockerImageName':'uhd-builder-ubuntu1804'}, 'Ubuntu-2004-builder':{'dockerOSName':'ubuntu2004','dockerImageName':'uhd-builder-ubuntu2004'}}" - name: winDockerImages