From 8a9a865e889fa760abfe33da4dfbe8d6a29eb8a2 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Fri, 14 Oct 2022 09:01:30 +0200 Subject: Move EPEL enabling to CentOS 7 image We do all the prep work in the image step for the other targets, so let's do the same here. --- .github/containers/centos7/Dockerfile | 2 +- .github/containers/centos7/build.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to '.github') diff --git a/.github/containers/centos7/Dockerfile b/.github/containers/centos7/Dockerfile index 36e86fbd..c27717ec 100644 --- a/.github/containers/centos7/Dockerfile +++ b/.github/containers/centos7/Dockerfile @@ -2,8 +2,8 @@ FROM centos:7 RUN yum -y groupinstall 'Development Tools' RUN yum -y install centos-packager - RUN yum -y install sudo +RUN yum -y install epel-release RUN useradd -s /bin/bash -m rpm RUN echo >> /etc/sudoers diff --git a/.github/containers/centos7/build.sh b/.github/containers/centos7/build.sh index 883e8b65..0e848701 100755 --- a/.github/containers/centos7/build.sh +++ b/.github/containers/centos7/build.sh @@ -33,7 +33,6 @@ sed -i "s/@VERSION@/${VERSION}/" ${CURDIR}/rpmbuild/SPECS/tigervnc.spec docker run --volume ${CURDIR}/rpmbuild:/home/rpm/rpmbuild --interactive --rm tigervnc/${DOCKER} \ bash -e -x -c " - sudo yum install -y epel-release; sudo yum-builddep -y ~/rpmbuild/SPECS/tigervnc.spec; sudo chown 0.0 ~/rpmbuild/SOURCES/*; sudo chown 0.0 ~/rpmbuild/SPECS/*; -- cgit v1.2.3