diff options
| author | Pierre Ossman <ossman@cendio.se> | 2022-10-14 09:01:30 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2022-10-14 09:29:31 +0200 |
| commit | 8a9a865e889fa760abfe33da4dfbe8d6a29eb8a2 (patch) | |
| tree | 79376fc3865f971caa6c4b111313ebd3da1cfcf4 | |
| parent | bb84646b5373b8d8f339f852bff4e1c661c465fc (diff) | |
| download | tigervnc-8a9a865e889fa760abfe33da4dfbe8d6a29eb8a2.tar.gz tigervnc-8a9a865e889fa760abfe33da4dfbe8d6a29eb8a2.zip | |
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.
| -rw-r--r-- | .github/containers/centos7/Dockerfile | 2 | ||||
| -rwxr-xr-x | .github/containers/centos7/build.sh | 1 |
2 files changed, 1 insertions, 2 deletions
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/*; |