github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-04 02:56:18 +00:00
Code Issues Projects Releases Wiki Activity

Dockerfile: Install pcre-tools later to avoid dependency issue

Browse Source 
When pcre-tools is installed before build/obs-service-tar_scm
then "build-mkbaselibs-20180629-289.1.noarch.rpm" is installed
as dependency but OBS repo does not have that rpm. So install
"pcre-tools" at the end and dockerfile builds fine on ppc64le.

Fixes:  #139

Signed-off-by: Nitesh Konkar niteshkonkar@in.ibm.com
This commit is contained in:
Nitesh Konkar 2018-08-24 20:50:14 +05:30
parent 98bf3ae2be
commit 17253b3bf9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
obs-packaging/Dockerfile
View File

@ -5,11 +5,11 @@ ARG SUSE_VERSION=${SUSE_VERSION:-42.3}
ARG GO_ARCH=${GO_ARCH:-amd64} ARG GO_ARCH=${GO_ARCH:-amd64}
# Get OBS client, plugins and dependencies # Get OBS client, plugins and dependencies
RUN zypper -v -n install osc-plugin-install vim curl bsdtar git sudo pcre-tools RUN zypper -v -n install osc-plugin-install vim curl bsdtar git sudo
RUN curl -OkL https://download.opensuse.org/repositories/openSUSE:Tools/openSUSE_${SUSE_VERSION}/openSUSE:Tools.repo RUN curl -OkL https://download.opensuse.org/repositories/openSUSE:Tools/openSUSE_${SUSE_VERSION}/openSUSE:Tools.repo
RUN zypper -n addrepo openSUSE:Tools.repo RUN zypper -n addrepo openSUSE:Tools.repo
RUN zypper --gpg-auto-import-keys refresh RUN zypper --gpg-auto-import-keys refresh
RUN zypper -n install build \ RUN zypper -v -n install build \
obs-service-tar_scm \ obs-service-tar_scm \
obs-service-verify_file \ obs-service-verify_file \
obs-service-obs_scm \ obs-service-obs_scm \
@ -21,7 +21,7 @@ RUN curl -OL https://dl.google.com/go/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz
RUN tar -C /usr/local -xzf go${GO_VERSION}.linux-${GO_ARCH}.tar.gz RUN tar -C /usr/local -xzf go${GO_VERSION}.linux-${GO_ARCH}.tar.gz
# Local build dependencies # Local build dependencies
RUN zypper -n install make gcc yum xz RUN zypper -v -n install make gcc yum xz pcre-tools
# Add go compiler to the PATH # Add go compiler to the PATH
ENV PATH /usr/local/go/bin:$PATH ENV PATH /usr/local/go/bin:$PATH