Skip to content

asdf: update asdf and all its plugins #189

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

Merged
merged 3 commits into from
Mar 21, 2023
Merged

asdf: update asdf and all its plugins #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecef0a2
asdf: update `asdf` and all its plugins
humitos Mar 9, 2023
ed119a4
Docs: update readme to mention `ubuntu-22.04` and `buildx`
humitos Mar 9, 2023
07a1e91
Tests: update version to check
humitos Mar 9, 2023
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
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Read the Docs - Environment base
FROM ubuntu:22.04
LABEL mantainer="Read the Docs <[email protected]>"
LABEL version="ubuntu-22.04-2022.03.15"
LABEL version="ubuntu-22.04-2023.03.09"

ENV DEBIAN_FRONTEND noninteractive
ENV LANG C.UTF-8
Expand Down Expand Up @@ -112,7 +112,7 @@ USER docs
WORKDIR /home/docs

# Install asdf
RUN git clone https://github.com/asdf-vm/asdf.git ~/.asdf --depth 1 --branch v0.9.0
RUN git clone https://github.com/asdf-vm/asdf.git ~/.asdf --depth 1 --branch v0.11.2
RUN echo ". /home/docs/.asdf/asdf.sh" >> /home/docs/.bashrc
RUN echo ". /home/docs/.asdf/completions/asdf.bash" >> /home/docs/.bashrc

Expand Down
13 changes: 11 additions & 2 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ repository:
Ubuntu 20.04 supporting multiple versions of Python, PyPy, conda, mamba, nodejs, rust and go.
Available for public usage as ``build.os: ubuntu-20.04``

`readthedocs/build:ubuntu-22.04-YYYY.MM.DD`
Ubuntu 22.04 supporting multiple versions of Python, PyPy, conda, mamba, nodejs, rust and go.
Available for public usage as ``build.os: ubuntu-22.04``

Note that these images only contains the basic dependencies:

- ``asdf`` CLI manager to install the languages versions
Expand All @@ -31,11 +35,16 @@ Usage

To use the pre-built images, you can pull from Docker Hub:

docker pull readthedocs/build:ubuntu-20.04-YYYY.MM.DD
docker pull readthedocs/build:ubuntu-22.04-YYYY.MM.DD

.. note::

Docker has changed how the iamges are build and now ``buildx`` is required.
Read how to install it in your system at https://docs.docker.com/build/install-buildx/

You can also compile these images locally:

docker build -t readthedocs/build:ubuntu-20.04-YYYY.MM.DD .
docker build -t readthedocs/build:ubuntu-22.04-YYYY.MM.DD .

See `CONTRIBUTING`_ for more information on building and testing.

Expand Down
4 changes: 2 additions & 2 deletions tests/test_versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
@pytest.mark.parametrize(
'command,expected_output',
[
('asdf version', 'v0.9.0-9ee24a3'),
('asdf version', 'v0.11.2-8eb11b8'),
('asdf plugin list', '\n'.join(['golang', 'nodejs', 'python', 'rust'])),
('git --version', 'git version 2.34.1'),
]
)
def test_command_versions_image_ubuntu20(command, expected_output):
def test_command_versions_image_ubuntu22(command, expected_output):
cmd_output = run_command_in_container(DOCKER_IMAGE, command)
assert cmd_output == expected_output