fix merge conflict
This commit is contained in:
commit
8e2dbc253a
1 changed files with 13241 additions and 7325 deletions
|
|
@ -6,13 +6,14 @@ RUN set -x \
|
|||
&& sed -i "s|# deb-src|deb-src|g" /etc/apt/sources.list \
|
||||
&& export DEBIAN_FRONTEND=noninteractive \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y libopenblas-dev libcurl4-openssl-dev libicu-dev libpcre2-dev wget python3-pip ruby ruby-dev \
|
||||
&& apt-get install -y curl libopenblas-dev libcurl4-openssl-dev libicu-dev liblapack-dev libpcre2-dev wget python3-pip \
|
||||
&& apt-get build-dep -y r-base
|
||||
|
||||
RUN pip3 install awscli
|
||||
|
||||
# Pin fpm to avoid git dependency in 1.12.0
|
||||
RUN gem install fpm:1.11.0
|
||||
RUN curl -LO "https://github.com/goreleaser/nfpm/releases/download/v2.18.1/nfpm_$(dpkg --print-architecture).deb" && \
|
||||
apt install -y "./nfpm_$(dpkg --print-architecture).deb" && \
|
||||
rm "nfpm_$(dpkg --print-architecture).deb"
|
||||
|
||||
RUN chmod 0777 /opt
|
||||
|
||||
|
|
@ -21,4 +22,5 @@ ENV PAGER /usr/bin/pager
|
|||
|
||||
COPY package.ubuntu-2004 /package.sh
|
||||
COPY build.sh .
|
||||
COPY patches /patches
|
||||
ENTRYPOINT ./build.sh
|
||||
|
|
|
|||
Loading…
Reference in a new issue