Skip to content

Updated R, Python, TensorFlow #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated R, Python, TensorFlow #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e15364f
Updated python R Tensorflow
jnolis Sep 16, 2021
7015c01
Updated the maintainer
jnolis Sep 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
# limitations under the License.
# =========================================================================

FROM rocker/r-ver:3.6.3
FROM rocker/r-ver:4.1.0

LABEL org.label-schema.license="Apache-2.0" \
org.label-schema.vcs-url="https://github.com/tmobile/r-tensorflow-api" \
org.label-schema.vendor="T-Mobile" \
maintainer="Jacqueline Nolis (GitHub @jnolis)"
maintainer="Heather Nolis (GitHub @Nolistic)"

# update some packages, including sodium and apache2, then clean
RUN apt-get update \
Expand All @@ -41,14 +41,12 @@ RUN apt-get update \
libsm6 \
libxrender1 \
bzip2 \
apache2 \
zlib1g-dev \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/

# install miniconda, and set the appropriate path variables.
# install Python 3.7 (Miniconda) and Tensorflow Python packages then set path variables.
RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-py37_4.8.2-Linux-x86_64.sh -O ~/miniconda.sh && \
RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-py39_4.9.2-Linux-x86_64.sh -O ~/miniconda.sh && \
/bin/bash ~/miniconda.sh -b -p /opt/conda && \
rm ~/miniconda.sh && \
/opt/conda/bin/conda clean -tipsy && \
Expand All @@ -58,8 +56,7 @@ RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-py37_4.8.2-Linux
ENV PATH /opt/conda/bin:$PATH

# install tensorflow and h5py using the pip that links to miniconda (the default pip is for python 2.7)
RUN /opt/conda/bin/conda install tensorflow==2.0.0 h5py==2.10.0 && \
/opt/conda/bin/conda clean -tipsy
RUN /opt/conda/bin/pip install tensorflow==2.6.0 h5py==3.1.0

# let R know the right version of python to use
ENV RETICULATE_PYTHON /opt/conda/bin/python
Expand Down
10 changes: 4 additions & 6 deletions Dockerfile.https
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
# limitations under the License.
# =========================================================================

FROM rocker/r-ver:3.6.3
FROM rocker/r-ver:4.1.0

LABEL org.label-schema.license="Apache-2.0" \
org.label-schema.vcs-url="https://github.com/tmobile/r-tensorflow-api" \
org.label-schema.vendor="T-Mobile" \
maintainer="Jacqueline Nolis (GitHub @jnolis)"
maintainer="Heather Nolis (GitHub @Nolistic)"

# update some packages, including sodium and apache2, then clean
RUN apt-get update \
Expand Down Expand Up @@ -47,8 +47,7 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/

# install miniconda, and set the appropriate path variables.
# install Python 3.7 (Miniconda) and Tensorflow Python packages then set path variables.
RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-py37_4.8.2-Linux-x86_64.sh -O ~/miniconda.sh && \
RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-py39_4.9.2-Linux-x86_64.sh -O ~/miniconda.sh && \
/bin/bash ~/miniconda.sh -b -p /opt/conda && \
rm ~/miniconda.sh && \
/opt/conda/bin/conda clean -tipsy && \
Expand All @@ -58,8 +57,7 @@ RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-py37_4.8.2-Linux
ENV PATH /opt/conda/bin:$PATH

# install tensorflow and h5py using the pip that links to miniconda (the default pip is for python 2.7)
RUN /opt/conda/bin/conda install tensorflow==2.0.0 h5py==2.10.0 && \
/opt/conda/bin/conda clean -tipsy
RUN /opt/conda/bin/pip install tensorflow==2.6.0 h5py==3.1.0

# let R know the right version of python to use
ENV RETICULATE_PYTHON /opt/conda/bin/python
Expand Down
6 changes: 6 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# r-tensorflow-api v1.1.2 - 2021-09-16
- Updated to R version 4.1.0
- Upgraded to Python 3.9 and TensorFlow 2.6.0
- Switched Python packages back to pip to get more recent versions unavailable on conda
- removed the apache2 dependency from the HTTP version

# r-tensorflow-api v1.1.1 - 2020-05-31

- Updated to R version 3.6.3
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![License](https://img.shields.io/badge/License-Apache%202.0-yellowgreen.svg)](LICENSE)

_(version 1.1.1)_
_(version 1.1.2)_

This repository creates a production-ready docker image that uses R and the [keras](https://keras.rstudio.com/) and [plumber](https://github.com/trestletech/plumber) R packages to create a neural network powered REST API. The package keras provides the ability to create neural networks, while plumber allows it to run R as a web service. The docker container is designed to be:

Expand Down