Merge pull request #146 from nitkon/patch-3

Dockerfile: Install pcre-tools later to avoid dependency issue
This commit is contained in:
Salvador Fuentes 2018-08-27 09:19:46 -05:00 committed by GitHub
commit a7ec33d0ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5,11 +5,11 @@ ARG SUSE_VERSION=${SUSE_VERSION:-42.3}
ARG GO_ARCH=${GO_ARCH:-amd64}
# 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 zypper -n addrepo openSUSE:Tools.repo
RUN zypper --gpg-auto-import-keys refresh
RUN zypper -n install build \
RUN zypper -v -n install build \
obs-service-tar_scm \
obs-service-verify_file \
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
# 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
ENV PATH /usr/local/go/bin:$PATH