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

Merge pull request #51 from rstudio/fix-c6

Browse source 
Fix pip installation on CentOS 6; RStudio, Inc -> PBC
This commit is contained in:
Greg Lin 2020-04-24 13:24:05 -05:00 • committed by GitHub
commit 0e2cfa3f83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
builder/Dockerfile.centos-6
View file

@ -50,8 +50,8 @@ RUN yum -y update \
&& yum clean all && yum clean all
# Install pip # Install pip
RUN curl "https://bootstrap.pypa.io/2.6/get-pip.py" -o "get-pip.py" && \ RUN yum install -y epel-release && \
python get-pip.py yum install -y python-pip
# Install AWS CLI. # Install AWS CLI.
RUN pip install awscli --upgrade --user && \ RUN pip install awscli --upgrade --user && \

4
builder/package.centos-6
View file

@ -36,12 +36,12 @@ fpm \
-t rpm \ -t rpm \
-v 1 \ -v 1 \
-n R-${R_VERSION} \ -n R-${R_VERSION} \
--vendor "RStudio Inc." \ --vendor "RStudio, PBC" \
--deb-priority "optional" \ --deb-priority "optional" \
--deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \ --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
--url "http://www.r-project.org/" \ --url "http://www.r-project.org/" \
--description "GNU R statistical computation and graphics system" \ --description "GNU R statistical computation and graphics system" \
--maintainer "RStudio Inc https://github.com/rstudio/r-builds" \ --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
--license "GPL-2" \ --license "GPL-2" \
--after-install /post-install.sh \ --after-install /post-install.sh \
--after-remove /before-remove.sh \ --after-remove /before-remove.sh \

4
builder/package.centos-7
View file

@ -22,12 +22,12 @@ fpm \
-t rpm \ -t rpm \
-v 1 \ -v 1 \
-n R-${R_VERSION} \ -n R-${R_VERSION} \
--vendor "RStudio Inc." \ --vendor "RStudio, PBC" \
--deb-priority "optional" \ --deb-priority "optional" \
--deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \ --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
--url "http://www.r-project.org/" \ --url "http://www.r-project.org/" \
--description "GNU R statistical computation and graphics system" \ --description "GNU R statistical computation and graphics system" \
--maintainer "RStudio Inc https://github.com/rstudio/r-builds" \ --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
--license "GPL-2" \ --license "GPL-2" \
--after-install /post-install.sh \ --after-install /post-install.sh \
--after-remove /before-remove.sh \ --after-remove /before-remove.sh \

4
builder/package.centos-8
View file

@ -20,12 +20,12 @@ fpm \
-t rpm \ -t rpm \
-v 1 \ -v 1 \
-n R-${R_VERSION} \ -n R-${R_VERSION} \
--vendor "RStudio Inc." \ --vendor "RStudio, PBC" \
--deb-priority "optional" \ --deb-priority "optional" \
--deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \ --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
--url "http://www.r-project.org/" \ --url "http://www.r-project.org/" \
--description "GNU R statistical computation and graphics system" \ --description "GNU R statistical computation and graphics system" \
--maintainer "RStudio Inc https://github.com/rstudio/r-builds" \ --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
--license "GPL-2" \ --license "GPL-2" \
--after-install /post-install.sh \ --after-install /post-install.sh \
--after-remove /before-remove.sh \ --after-remove /before-remove.sh \

4
builder/package.debian-9
View file

@ -9,12 +9,12 @@ fpm \
-t deb \ -t deb \
-v 1 \ -v 1 \
-n R-${R_VERSION} \ -n R-${R_VERSION} \
--vendor "RStudio Inc." \ --vendor "RStudio, PBC" \
--deb-priority "optional" \ --deb-priority "optional" \
--deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \ --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
--url "http://www.r-project.org/" \ --url "http://www.r-project.org/" \
--description "GNU R statistical computation and graphics system" \ --description "GNU R statistical computation and graphics system" \
--maintainer "RStudio Inc https://github.com/rstudio/r-builds" \ --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
--license "GPL-2" \ --license "GPL-2" \
-p /tmp/output/debian-9/ \ -p /tmp/output/debian-9/ \
-d ca-certificates \ -d ca-certificates \

4
builder/package.opensuse-15
View file

@ -22,12 +22,12 @@ fpm \
-t rpm \ -t rpm \
-v 1 \ -v 1 \
-n R-${R_VERSION} \ -n R-${R_VERSION} \
--vendor "RStudio Inc." \ --vendor "RStudio, PBC" \
--deb-priority "optional" \ --deb-priority "optional" \
--deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \ --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
--url "http://www.r-project.org/" \ --url "http://www.r-project.org/" \
--description "GNU R statistical computation and graphics system" \ --description "GNU R statistical computation and graphics system" \
--maintainer "RStudio Inc https://github.com/rstudio/r-builds" \ --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
--license "GPL-2" \ --license "GPL-2" \
--after-install /post-install.sh \ --after-install /post-install.sh \
--after-remove /before-remove.sh \ --after-remove /before-remove.sh \

4
builder/package.opensuse-42
View file

@ -22,12 +22,12 @@ fpm \
-t rpm \ -t rpm \
-v 1 \ -v 1 \
-n R-${R_VERSION} \ -n R-${R_VERSION} \
--vendor "RStudio Inc." \ --vendor "RStudio, PBC" \
--deb-priority "optional" \ --deb-priority "optional" \
--deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \ --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
--url "http://www.r-project.org/" \ --url "http://www.r-project.org/" \
--description "GNU R statistical computation and graphics system" \ --description "GNU R statistical computation and graphics system" \
--maintainer "RStudio Inc https://github.com/rstudio/r-builds" \ --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
--license "GPL-2" \ --license "GPL-2" \
--after-install /post-install.sh \ --after-install /post-install.sh \
--after-remove /before-remove.sh \ --after-remove /before-remove.sh \

4
builder/package.ubuntu-1604
View file

@ -9,12 +9,12 @@ fpm \
-t deb \ -t deb \
-v 1 \ -v 1 \
-n R-${R_VERSION} \ -n R-${R_VERSION} \
--vendor "RStudio Inc." \ --vendor "RStudio, PBC" \
--deb-priority "optional" \ --deb-priority "optional" \
--deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \ --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
--url "http://www.r-project.org/" \ --url "http://www.r-project.org/" \
--description "GNU R statistical computation and graphics system" \ --description "GNU R statistical computation and graphics system" \
--maintainer "RStudio Inc https://github.com/rstudio/r-builds" \ --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
--license "GPL-2" \ --license "GPL-2" \
-p /tmp/output/ubuntu-1604/ \ -p /tmp/output/ubuntu-1604/ \
-d g++ \ -d g++ \

4
builder/package.ubuntu-1804
View file

@ -9,12 +9,12 @@ fpm \
-t deb \ -t deb \
-v 1 \ -v 1 \
-n R-${R_VERSION} \ -n R-${R_VERSION} \
--vendor "RStudio Inc." \ --vendor "RStudio, PBC" \
--deb-priority "optional" \ --deb-priority "optional" \
--deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \ --deb-field 'Bugs: https://github.com/rstudio/r-builds/issues' \
--url "http://www.r-project.org/" \ --url "http://www.r-project.org/" \
--description "GNU R statistical computation and graphics system" \ --description "GNU R statistical computation and graphics system" \
--maintainer "RStudio Inc https://github.com/rstudio/r-builds" \ --maintainer "RStudio, PBC https://github.com/rstudio/r-builds" \
--license "GPL-2" \ --license "GPL-2" \
-p /tmp/output/ubuntu-1804/ \ -p /tmp/output/ubuntu-1804/ \
-d g++ \ -d g++ \