Skip to content

Commit

Permalink
update to 1.10.0
Browse files Browse the repository at this point in the history
Signed-off-by: Robert Steiner <robert@flower.ai>
  • Loading branch information
Robert-Steiner committed Jul 24, 2024
1 parent 0bc1368 commit bd7032e
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 35 deletions.
13 changes: 4 additions & 9 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@
# The current released version
rst_prolog = """
.. |current_flwr_version| replace:: 1.10.0
.. |latest_version_docker_sha| replace:: 985c24b2b337ab7f15a554fde9d860cede95079bcaa244fda8f12c0805e34c7d
.. |ubuntu_version| replace:: 22.04
.. |setuptools_version| replace:: 70.3.0
.. |pip_version| replace:: 24.1.2
"""

# -- General configuration ---------------------------------------------------
Expand Down Expand Up @@ -336,12 +340,3 @@ def find_test_modules(package_path):
# -- Options for MyST config -------------------------------------
# Enable this option to link to headers (`#`, `##`, or `###`)
myst_heading_anchors = 3

# -- Options for sphinx_substitution_extensions -------------------
rst_prolog = """
.. |latest_version_docker| replace:: 1.10.0.dev20240723
.. |latest_version_docker_sha| replace:: 985c24b2b337ab7f15a554fde9d860cede95079bcaa244fda8f12c0805e34c7d
.. |ubuntu_version| replace:: 22.04
.. |setuptools_version| replace:: 70.3.0
.. |pip_version| replace:: 24.1.2
"""
2 changes: 1 addition & 1 deletion doc/source/docker/persist-superlink-state.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ database file.
$ mkdir state
$ sudo chown -R 49999:49999 state
$ docker run --rm \
--volume ./state/:/app/state flwr/superlink:|latest_version_docker| \
--volume ./state/:/app/state flwr/superlink:|current_flwr_version| \
--database state.db \
...
Expand Down
6 changes: 3 additions & 3 deletions doc/source/docker/pinning-version.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ Example
-------

The following command returns the current image digest referenced by the
:substitution-code:`superlink:|latest_version_docker|` tag:
:substitution-code:`superlink:|current_flwr_version|` tag:

.. code-block:: bash
:substitutions:
$ docker pull flwr/superlink:|latest_version_docker|
$ docker inspect --format='{{index .RepoDigests 0}}' flwr/superlink:|latest_version_docker|
$ docker pull flwr/superlink:|current_flwr_version|
$ docker inspect --format='{{index .RepoDigests 0}}' flwr/superlink:|current_flwr_version|
flwr/superlink@sha256:|latest_version_docker_sha|
Next, we can pin the digest when running a new SuperLink container:
Expand Down
4 changes: 2 additions & 2 deletions doc/source/docker/root-user.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Run the Docker image with the ``-u`` flag and specify ``root`` as the username:
.. code-block:: bash
:substitutions:
$ docker run --rm -u root flwr/superlink:|latest_version_docker|
$ docker run --rm -u root flwr/superlink:|current_flwr_version|
This command will run the Docker container with root user privileges.

Expand All @@ -30,7 +30,7 @@ missing system dependencies, you can use the ``USER root`` directive within your
:caption: SuperNode Dockerfile
:substitutions:
FROM flwr/supernode:|latest_version_docker|
FROM flwr/supernode:|current_flwr_version|
# Switch to root user
USER root
Expand Down
2 changes: 1 addition & 1 deletion doc/source/docker/set-environment-variables.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ Example
:substitutions:
$ docker run -e FLWR_TELEMETRY_ENABLED=0 -e FLWR_TELEMETRY_LOGGING=0 \
--rm flwr/superlink:|latest_version_docker|
--rm flwr/superlink:|current_flwr_version|
18 changes: 9 additions & 9 deletions doc/source/docker/tls.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Assuming all files we need are in the local ``certificates`` directory, we can u
$ docker run --rm \
--volume ./certificates/:/app/certificates/:ro \
flwr/superlink:|latest_version_docker| \
flwr/superlink:|current_flwr_version| \
--ssl-ca-certfile certificates/ca.crt \
--ssl-certfile certificates/server.pem \
--ssl-keyfile certificates/server.key
Expand All @@ -50,8 +50,8 @@ Assuming all files we need are in the local ``certificates`` directory, we can u
|
| This allows the container to access the TLS certificates that are stored in the certificates
| directory.
* | :substitution-code:`flwr/superlink:|latest_version_docker|`: The name of the image to be run and the specific
| tag of the image. The tag :substitution-code:`|latest_version_docker|` represents a specific version of the image.
* | :substitution-code:`flwr/superlink:|current_flwr_version|`: The name of the image to be run and the specific
| tag of the image. The tag :substitution-code:`|current_flwr_version|` represents a specific version of the image.
* | ``--ssl-ca-certfile certificates/ca.crt``: Specify the location of the CA certificate file
| inside the container.
|
Expand Down Expand Up @@ -79,7 +79,7 @@ certificate into the container's ``/app/`` directory:
$ docker run --rm \
--volume ./ca.crt:/app/ca.crt/:ro \
flwr/supernode:|latest_version_docker| \
flwr/supernode:|current_flwr_version| \
--root-certificates ca.crt
.. dropdown:: Understanding the command
Expand All @@ -89,8 +89,8 @@ certificate into the container's ``/app/`` directory:
* | ``--volume ./ca.crt:/app/ca.crt/:ro``: Mount the ``ca.crt`` file from the
| current working directory of the host machine as a read-only volume at the ``/app/ca.crt``
| directory inside the container.
* | :substitution-code:`flwr/supernode:|latest_version_docker|`: The name of the image to be run and the specific
| tag of the image. The tag :substitution-code:`|latest_version_docker|` represents a specific version of the image.
* | :substitution-code:`flwr/supernode:|current_flwr_version|`: The name of the image to be run and the specific
| tag of the image. The tag :substitution-code:`|current_flwr_version|` represents a specific version of the image.
* | ``--root-certificates ca.crt``: This specifies the location of the CA certificate file
| inside the container.
|
Expand All @@ -108,7 +108,7 @@ Assuming all files we need are in the local ``certificates`` directory, we can u
$ docker run --rm \
--volume ./certificates/:/app/certificates/:ro \
flwr/superexec:|latest_version_docker| \
flwr/superexec:|current_flwr_version| \
--ssl-ca-certfile certificates/ca.crt \
--ssl-certfile certificates/server.pem \
--ssl-keyfile certificates/server.key \
Expand All @@ -126,8 +126,8 @@ Assuming all files we need are in the local ``certificates`` directory, we can u
|
| This allows the container to access the TLS certificates that are stored in the certificates
| directory.
* | :substitution-code:`flwr/superexec:|latest_version_docker|`: The name of the image to be run and the specific
| tag of the image. The tag :substitution-code:`|latest_version_docker|` represents a specific version of the image.
* | :substitution-code:`flwr/superexec:|current_flwr_version|`: The name of the image to be run and the specific
| tag of the image. The tag :substitution-code:`|current_flwr_version|` represents a specific version of the image.
* | ``--ssl-ca-certfile certificates/ca.crt``: Specify the location of the CA certificate file
| inside the container.
|
Expand Down
18 changes: 9 additions & 9 deletions doc/source/docker/tutorial-quickstart-docker.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Open your terminal and run:
--network flwr-network \
--name superlink \
--detach \
flwr/superlink:|latest_version_docker| --insecure
flwr/superlink:|current_flwr_version| --insecure
.. dropdown:: Understand the command

Expand All @@ -71,8 +71,8 @@ Open your terminal and run:
* ``--network flwr-network``: Make the container join the network named ``flwr-network``.
* ``--name superlink``: Assign the name ``superlink`` to the container.
* ``--detach``: Run the container in the background, freeing up the terminal.
* | :substitution-code:`flwr/superlink:|latest_version_docker|`: The name of the image to be run and the specific
| tag of the image. The tag :substitution-code:`|latest_version_docker|` represents a :doc:`specific version <pinning-version>` of the image.
* | :substitution-code:`flwr/superlink:|current_flwr_version|`: The name of the image to be run and the specific
| tag of the image. The tag :substitution-code:`|current_flwr_version|` represents a :doc:`specific version <pinning-version>` of the image.
* | ``--insecure``: This flag tells the container to operate in an insecure mode, allowing
| unencrypted communication.
Expand All @@ -88,7 +88,7 @@ building your own SuperNode image.
:caption: Dockerfile.supernode
:substitutions:
FROM flwr/supernode:|latest_version_docker|
FROM flwr/supernode:|current_flwr_version|
WORKDIR /app
COPY docker_pyproject.toml pyproject.toml
Expand All @@ -101,8 +101,8 @@ building your own SuperNode image.
.. dropdown:: Understand the Dockerfile

* | :substitution-code:`FROM flwr/supernode:|latest_version_docker|`: This line specifies that the Docker image
| to be built from is the ``flwr/supernode image``, version :substitution-code:`|latest_version_docker|`.
* | :substitution-code:`FROM flwr/supernode:|current_flwr_version|`: This line specifies that the Docker image
| to be built from is the ``flwr/supernode image``, version :substitution-code:`|current_flwr_version|`.
* | ``WORKDIR /app``: Set the working directory for the container to ``/app``.
| Any subsequent commands that reference a directory will be relative to this directory.
* | ``COPY docker_pyproject.toml pyproject.toml``: Copy the ``docker_pyproject.toml`` file
Expand Down Expand Up @@ -206,7 +206,7 @@ Flower and serves as a base for building your own SuperExec image.
:caption: Dockerfile.superexec
:substitutions:
FROM flwr/superexec:|latest_version_docker|
FROM flwr/superexec:|current_flwr_version|
WORKDIR /app
COPY docker_pyproject.toml pyproject.toml
Expand All @@ -216,8 +216,8 @@ Flower and serves as a base for building your own SuperExec image.
.. dropdown:: Understand the Dockerfile

* | :substitution-code:`FROM flwr/superexec:|latest_version_docker|`: This line specifies that the Docker image
| to be built from is the ``flwr/superexec image``, version :substitution-code:`|latest_version_docker|`.
* | :substitution-code:`FROM flwr/superexec:|current_flwr_version|`: This line specifies that the Docker image
| to be built from is the ``flwr/superexec image``, version :substitution-code:`|current_flwr_version|`.
* | ``WORKDIR /app``: Set the working directory for the container to ``/app``.
| Any subsequent commands that reference a directory will be relative to this directory.
* | ``COPY docker_pyproject.toml pyproject.toml``: Copy the ``docker_pyproject.toml`` file
Expand Down
1 change: 0 additions & 1 deletion doc/source/how-to-run-flower-using-docker.rst

This file was deleted.

0 comments on commit bd7032e

Please sign in to comment.