From 099defa442cc32d369e852aaac286457933c5b6d Mon Sep 17 00:00:00 2001 From: tom doron Date: Thu, 12 May 2022 15:41:58 -0700 Subject: [PATCH 1/2] add a dockerfilew for building CI for redat UBI motivation: support redhar distro changes: add a dockerfile for building a toolchain on redhat UBI 8 --- swift-ci/master/redhat/ubi8/Dockerfile | 46 ++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 swift-ci/master/redhat/ubi8/Dockerfile diff --git a/swift-ci/master/redhat/ubi8/Dockerfile b/swift-ci/master/redhat/ubi8/Dockerfile new file mode 100644 index 00000000..8214a59a --- /dev/null +++ b/swift-ci/master/redhat/ubi8/Dockerfile @@ -0,0 +1,46 @@ +FROM redhat/ubi8 + +RUN groupadd -g 42 build-user && \ + useradd -m -r -u 42 -g build-user build-user + +#RUN subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms +RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm + +# Update and install needed build packages +RUN yum -y install \ + autoconf \ + autoconf \ + clang \ + diffutils \ + git \ + glibc-static \ + libbsd-devel \ + libcurl-devel \ + libedit-devel \ + libicu-devel \ + libstdc++-static \ + libtool \ + libuuid-devel \ + libxml2-devel \ + make \ + ncurses-devel \ + pcre-devel \ + platform-python-devel \ + python2 \ + python2-devel \ + python2-six \ + python3 \ +# python3-pexpect \ + python3-six \ + rsync \ + sqlite-devel \ + swig \ + tar \ + which + +RUN alternatives --install /usr/bin/pip pip /usr/bin/pip2 1 +RUN alternatives --set python /usr/bin/python2 + +USER build-user + +WORKDIR /home/build-user From 4ac862eb748d9e715969c30759fcc64125ca826d Mon Sep 17 00:00:00 2001 From: tomer doron Date: Wed, 16 Nov 2022 11:20:01 -0800 Subject: [PATCH 2/2] Apply suggestions from code review --- swift-ci/master/redhat/ubi8/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/swift-ci/master/redhat/ubi8/Dockerfile b/swift-ci/master/redhat/ubi8/Dockerfile index 8214a59a..194614df 100644 --- a/swift-ci/master/redhat/ubi8/Dockerfile +++ b/swift-ci/master/redhat/ubi8/Dockerfile @@ -3,7 +3,6 @@ FROM redhat/ubi8 RUN groupadd -g 42 build-user && \ useradd -m -r -u 42 -g build-user build-user -#RUN subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm # Update and install needed build packages @@ -30,7 +29,6 @@ RUN yum -y install \ python2-devel \ python2-six \ python3 \ -# python3-pexpect \ python3-six \ rsync \ sqlite-devel \