devxy/r-builds
Watch
2
0
Fork
You've already forked r-builds
 0
Code Issues 1 Pull requests Releases Activity

Merge pull request #5 from rstudio/glin-pager

Browse source 
Fix default pager for CentOS and openSUSE builds
This commit is contained in:
Greg Lin 2019-05-06 11:00:36 -05:00 • committed by GitHub
commit 47203e7431
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
builder/Dockerfile.centos-6
View file

@ -17,7 +17,6 @@ RUN yum -y update \
krb5-devel \ krb5-devel \
krb5-libs \ krb5-libs \
lapack-devel \ lapack-devel \
less \
libICE-devel \ libICE-devel \
libSM-devel \ libSM-devel \
libX11-devel \ libX11-devel \

1
builder/Dockerfile.centos-7
View file

@ -16,7 +16,6 @@ RUN yum -y update \
java-1.8.0-openjdk-devel \ java-1.8.0-openjdk-devel \
java-1.8.0-openjdk-headless \ java-1.8.0-openjdk-headless \
lapack-devel \ lapack-devel \
less \
libICE-devel \ libICE-devel \
libSM-devel \ libSM-devel \
libX11-devel \ libX11-devel \

3
builder/Dockerfile.debian-9
View file

@ -13,5 +13,8 @@ RUN pip install awscli
RUN chmod 0777 /opt RUN chmod 0777 /opt
# Override the default pager used by R
ENV PAGER /usr/bin/pager
COPY build.sh . COPY build.sh .
ENTRYPOINT ./build.sh ENTRYPOINT ./build.sh

3
builder/Dockerfile.ubuntu-1604
View file

@ -13,5 +13,8 @@ RUN pip install awscli
RUN chmod 0777 /opt RUN chmod 0777 /opt
# Override the default pager used by R
ENV PAGER /usr/bin/pager
COPY build.sh . COPY build.sh .
ENTRYPOINT ./build.sh ENTRYPOINT ./build.sh

3
builder/Dockerfile.ubuntu-1804
View file

@ -13,5 +13,8 @@ RUN pip install awscli
RUN chmod 0777 /opt RUN chmod 0777 /opt
# Override the default pager used by R
ENV PAGER /usr/bin/pager
COPY build.sh . COPY build.sh .
ENTRYPOINT ./build.sh ENTRYPOINT ./build.sh

1
builder/build.sh
View file

@ -73,7 +73,6 @@ compile_r() {
# set some common environment variables for the configure step # set some common environment variables for the configure step
AWK=/usr/bin/awk \ AWK=/usr/bin/awk \
LIBnn=lib \ LIBnn=lib \
PAGER=/usr/bin/pager \
PERL=/usr/bin/perl \ PERL=/usr/bin/perl \
R_PDFVIEWER=xdg-open \ R_PDFVIEWER=xdg-open \
R_BROWSER=xdg-open \ R_BROWSER=xdg-open \