Skip to content
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

Jump to bottom

New version 8.0 #137

Merged
merged 9 commits into from
Sep 24, 2020
Merged

New version 8.0 #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ce9bfde
Upgrade Ubuntu to 20.04 LTS
humitos Aug 27, 2020
3ea74e0
Add early support for Python 3.9.0rc1
humitos Aug 27, 2020
5d0847b
Update readme mentioning 8.0
humitos Aug 27, 2020
295ef2d
Do not install python-pip
humitos Aug 27, 2020
e1d071b
Revert "Do not install python-pip"
humitos Aug 31, 2020
7758def
Install python3-pip
humitos Aug 31, 2020
f4ec9d2
Do not install Python dependencies on Py 3.9
humitos Aug 31, 2020
c855249
Install virtualenv in Python 3.9rc1
humitos Sep 1, 2020
7239b0f
Update Dockerfile
humitos Sep 24, 2020
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
15 changes: 12 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Read the Docs - Environment base
FROM ubuntu:18.04
FROM ubuntu:20.04
LABEL mantainer="Read the Docs <support@readthedocs.com>"

ENV DEBIAN_FRONTEND noninteractive
Expand Down Expand Up @@ -116,8 +116,8 @@ RUN apt-get -y install \
# Install Python tools/libs
ENV RTD_VIRTUALENV_VERSION 16.7.9
RUN apt-get -y install \
python-pip \
&& pip install -U \
python3-pip && \
pip3 install -U \
auxlib \
virtualenv==$RTD_VIRTUALENV_VERSION

Expand Down Expand Up @@ -150,17 +150,20 @@ ENV RTD_PYTHON_VERSION_35 3.5.7
ENV RTD_PYTHON_VERSION_36 3.6.8
ENV RTD_PYTHON_VERSION_37 3.7.3
ENV RTD_PYTHON_VERSION_38 3.8.0
ENV RTD_PYTHON_VERSION_39 3.9.0rc1
ENV RTD_PYPY_VERSION_35 pypy3.5-7.0.0

# Install supported Python versions
RUN pyenv install $RTD_PYTHON_VERSION_27 && \
pyenv install $RTD_PYTHON_VERSION_39 && \
pyenv install $RTD_PYTHON_VERSION_38 && \
pyenv install $RTD_PYTHON_VERSION_37 && \
pyenv install $RTD_PYTHON_VERSION_35 && \
pyenv install $RTD_PYTHON_VERSION_36 && \
pyenv install $RTD_PYPY_VERSION_35 && \
pyenv global \
$RTD_PYTHON_VERSION_27 \
$RTD_PYTHON_VERSION_39 \
$RTD_PYTHON_VERSION_38 \
$RTD_PYTHON_VERSION_37 \
$RTD_PYTHON_VERSION_36 \
Expand All @@ -180,6 +183,11 @@ RUN pyenv local $RTD_PYTHON_VERSION_27 && \

ENV RTD_PIP_VERSION 20.0.1
ENV RTD_SETUPTOOLS_VERSION 45.1.0
RUN pyenv local $RTD_PYTHON_VERSION_39 && \
pyenv exec pip install --no-cache-dir -U pip==$RTD_PIP_VERSION && \
pyenv exec pip install --no-cache-dir -U setuptools==$RTD_SETUPTOOLS_VERSION && \
pyenv exec pip install --no-cache-dir virtualenv==$RTD_VIRTUALENV_VERSION

RUN pyenv local $RTD_PYTHON_VERSION_38 && \
pyenv exec pip install --no-cache-dir -U pip==$RTD_PIP_VERSION && \
pyenv exec pip install --no-cache-dir -U setuptools==$RTD_SETUPTOOLS_VERSION && \
Expand Down Expand Up @@ -232,6 +240,7 @@ LABEL python.version_35=$PYTHON_VERSION_35
LABEL python.version_36=$PYTHON_VERSION_36
LABEL python.version_37=$PYTHON_VERSION_37
LABEL python.version_38=$PYTHON_VERSION_38
LABEL python.version_38=$PYTHON_VERSION_39
LABEL python.pip=$_PIP_VERSION
LABEL python.setuptools=$SETUPTOOLS_VERSION
LABEL python.virtualenv=$VIRTUALENV_VERSION
Expand Down
10 changes: 5 additions & 5 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ repository:
**Deprecated**
Ubuntu 18.04 supporting Python 2.7, 3.5, 3.6, 3.7.

`readthedocs/build:5.0`
`readthedocs/build:6.0`
``stable``
Ubuntu 18.04 supporting Python 2.7, 3.6, 3.7 and pypy3.5-7.0.0.
Ubuntu 18.04 supporting Python 2.7, 3.5, 3.6, 3.7, 3.8 and PyPy3.5-7.0.0.
This is the **stable** image supported by Read the Docs.

`readthedocs/build:6.0`
`readthedocs/build:7.0`
``latest``
Ubuntu 18.04 supporting Python 2.7, 3.5, 3.6, 3.7, 3.8 and PyPy3.5-7.0.0.
This is the **latest** default image used for documentation builds and supported by Read the Docs.

`readthedocs/build:7.0`
`readthedocs/build:8.0`
``testing``
Ubuntu 18.04 supporting Python 2.7, 3.5, 3.6, 3.7, 3.8 and PyPy3.5-7.0.0.
Ubuntu 20.04 supporting Python 2.7, 3.5, 3.6, 3.7, 3.8, 3.9.0rc1 and PyPy3.5-7.0.0.
For internal development **testing** only, not available for public usage yet.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this available as a testing image on RTD? We just don't document it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. This image is available via the config file build: image: testing but we don't document it.


.. _readthedocs/build: https://hub.docker.com/r/readthedocs/build/
Expand Down