Skip to content

Commit d0bd252

Browse files
authored
Fix rstats build (#158)
http://b/185379627
1 parent 239a47b commit d0bd252

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,15 @@ RUN apt-get install -y libhdf5-dev && \
3434
/tmp/clean-layer.sh
3535

3636
RUN apt-get install -y libzmq3-dev python-pip default-jdk && \
37-
apt-get install -y python-dev libcurl4-openssl-dev && \
37+
apt-get install -y python-dev libcurl4-openssl-dev libssl-dev && \
3838
pip install jupyter pycurl && \
3939
# Install older tornado - https://github.com/jupyter/notebook/issues/4437
4040
pip install "tornado<6" && \
4141
# to avoid breaking UI change, pin the jupyter notebook package
4242
# the latest version also has a regression on the NotebookApp.ip option
4343
# see: https://www.google.com/url?q=https://github.com/jupyter/notebook/issues/3946&sa=D&usg=AFQjCNFieP7srXVWqX8PDetXGfhyxRmO4Q
4444
pip install notebook==5.5.0 && \
45-
# Pin nbconvert b/170301227
46-
pip install nbconvert==5.6.1 && \
45+
pip install nbconvert && \
4746
R -e 'IRkernel::installspec()' && \
4847
# Build pyzmq from source instead of using a pre-built binary.
4948
yes | pip uninstall pyzmq && \

package_installs.R

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ library(devtools)
22
options(repos = c("CRAN" = "http://cran.us.r-project.org"))
33
options(Ncpus = parallel::detectCores())
44

5+
# Set download method, to avoid the default behavior of using
6+
# R's internal HTTP implementation, which doesn't support HTTPS connections.
7+
# https://stackoverflow.com/questions/45061272/r-and-ssl-curl-on-ubuntu-linux-failed-ssl-connect-in-r-but-works-in-curl
8+
options(download.file.method = "libcurl")
9+
510
# Install the lightGBM installer package
611
install_github("Laurae2/lgbdl")
712
lgbdl::lgb.dl(compiler = "gcc", commit = "tags/v2.3.1")
@@ -47,4 +52,4 @@ library(torch)
4752
install_torch(reinstall = TRUE)
4853

4954
# The R Keras package must be reinstalled after installing it in the python virtualenv.
50-
install.packages("keras")
55+
install_version("keras", version = "2.3.0.0", ask=FALSE)

0 commit comments

Comments
 (0)