From 71870c54b8a7248a9b2760051666b08ba897293c Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 15:31:26 +0000 Subject: [PATCH] build: add initscripts, coreutils-common and vim for developers usage (backport #58) (#59) This is an automatic backport of pull request #58 done by [Mergify](https://mergify.com). Cherry-pick of 1641fd1b447bff2286a09406b79e9602e907c39d has failed: ``` On branch mergify/bp/release_2.0/pr-58 Your branch is up to date with 'origin/release_2.0'. You are currently cherry-picking commit 1641fd1. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) Unmerged paths: (use "git add ..." to mark resolution) both modified: Dockerfile no changes added to commit (use "git add" and/or "git commit -a") ``` To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally ---
Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com
--- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 1163b35..5077de4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,11 @@ FROM rockylinux:8.5 +RUN cp -R /usr/lib64/libjson-c.so.4.0.0 /usr/lib64/libjson-c.so.4.0.0.ori RUN yum -y install epel-release yum-utils RUN yum-config-manager --enable powertools RUN yum -y install openldap-devel createrepo wget bzip2 patch make cmake cmake3 ctags automake texinfo file gcc gcc-c++ gcc-gfortran python3 libtool bison flex flex-devel perl-XML-Parser swig gettext libjpeg-turbo freetype fontconfig jasper-libs zlib-devel bzip2-devel libjpeg-turbo-devel freetype-devel fontconfig-devel rpm-build xz xz-devel expat-devel bc which git nspr-devel nss-devel popt-devel elfutils-devel elfutils elfutils-libelf-devel elfutils-libelf elfutils-libs openblas-devel valgrind ncurses-devel gperf libX11-devel libXft-devel libXrender-devel libXext-devel pixman-devel libtirpc-devel rpcgen libaec-devel tcsh libXmu-devel libXt-devel libXaw-devel byacc imake gsl-devel libcurl-devel pcre-devel openssl-devel libev-devel sqlite-devel c-ares-devel glib2-devel json-c-devel libxml2-devel libxslt-devel oniguruma-devel libpng-devel libevent-devel graphviz-devel tcl-devel tk-devel libtiff-devel openjpeg2-devel jasper-devel cairo-devel fribidi-devel harfbuzz-devel pango-devel gdbm-devel librsvg2-devel && rpm -qa |sort |md5sum |awk '{print $1;}' >/etc/buildimage_hash RUN wget https://dl.rockylinux.org/pub/rocky/8/PowerTools/x86_64/os/Packages/a/antlr-C++-2.7.7-56.module+el8.3.0+74+855e3f5d.x86_64.rpm RUN wget https://dl.rockylinux.org/pub/rocky/8/PowerTools/x86_64/os/Packages/a/antlr-tool-2.7.7-56.module+el8.3.0+74+855e3f5d.noarch.rpm RUN yum -y install ./antlr-C++-2.7.7-56.module+el8.3.0+74+855e3f5d.x86_64.rpm ./antlr-tool-2.7.7-56.module+el8.3.0+74+855e3f5d.noarch.rpm +RUN yum -y install initscripts vim coreutils-common +RUN mv /usr/lib64/libjson-c.so.4.0.0 /usr/lib64/libjson-c.so.4.0.0.new && cp -R /usr/lib64/libjson-c.so.4.0.0.ori /usr/lib64/libjson-c.so.4.0.0