Merge branch 'main' into files-in-file

Dockerfile

@@ -136,7 +136,7 @@ RUN chmod a+x /tmp/out/bin/*
 #
 # The previous build stage from which binaries are copied is controlled by the
 # MODE ARG (see above).
-FROM alpine:3.17 AS final
+FROM ${BASE_IMG} AS final
 
 # Copy binaries from the 'source' build stage into the image we are building
 COPY --from=source /tmp/out/bin/* /usr/local/bin/

README.md

@@ -11,7 +11,6 @@
 [![Spotify](https://img.shields.io/badge/Spotify-∞-brightgreen.svg)](https://open.spotify.com/user/alex.band/playlist/1DkYwN4e4tq73LGAeUykA1?si=AXNn9GkpQ4a-q5skG1yiYQ)
 [![Discord](https://img.shields.io/discord/818584154278199396?label=Discord&logo=discord)](https://discord.gg/8dvKB5Ykhy)
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/109262826617293067?domain=https%3A%2F%2Ffosstodon.org&style=social)](https://fosstodon.org/@nlnetlabs)
-[![Twitter Follow](https://img.shields.io/badge/follow-%40routinator3000-1DA1F2?logo=twitter&style=social)](https://twitter.com/routinator3000)
 
 Routinator 3000 is free, open-source RPKI Relying Party software. The project
 is written in Rust, a programming language designed for performance and
@@ -42,8 +41,7 @@ locations.
 NLnet Labs offers [professional support and consultancy
 services](https://www.nlnetlabs.nl/services/contracts/) with a service-level
 agreement. Community support is available on
-[Discord](https://discord.gg/8dvKB5Ykhy),
-[Twitter](https://twitter.com/routinator3000/) and our [mailing
+[Discord](https://discord.gg/8dvKB5Ykhy), and our [mailing
 list](https://lists.nlnetlabs.nl/mailman/listinfo/rpki). Routinator is
 liberally licensed under the [BSD 3-Clause
 license](https://github.com/NLnetLabs/routinator/blob/main/LICENSE).

doc/manual/source/building.rst

@@ -175,6 +175,13 @@ the following command:
 
    cargo install --locked --no-default-features --features socks,native-tls routinator
 
+If you want to enable a specific feature in the container, this is done via
+Docker build args, e.g.
+
+.. code-block:: text
+
+   docker build . --build-arg CARGO_ARGS="--features native-tls"
+
 Statically Linked Routinator
 ----------------------------
 

doc/manual/source/index.rst

@@ -26,15 +26,14 @@ Open-source with professional support services
    NLnet Labs offers `professional support and consultancy services
    <https://www.nlnetlabs.nl/services/contracts/>`_ with a service-level
    agreement. Community support is available on `Discord
-   <https://discord.gg/8dvKB5Ykhy>`_, `Twitter
-   <https://twitter.com/routinator3000/>`_ and our `mailing list
+   <https://discord.gg/8dvKB5Ykhy>`_ and our `mailing list
    <https://lists.nlnetlabs.nl/mailman/listinfo/rpki>`_. Routinator is
    liberally licensed under the `BSD 3-Clause license
    <https://github.com/NLnetLabs/routinator/blob/main/LICENSE>`_.
 
    .. only:: html
 
-      |discord| |mastodon| |twitter|
+      |discord| |mastodon|
 
       .. |discord| image:: https://img.shields.io/discord/818584154278199396   
          :alt: Discord
@@ -43,10 +42,6 @@ Open-source with professional support services
       .. |mastodon| image:: https://img.shields.io/mastodon/follow/109262826617293067?domain=https%3A%2F%2Ffosstodon.org&style=social
          :alt: Mastodon
          :target: https://fosstodon.org/@nlnetlabs
-
-      .. |twitter| image:: https://img.shields.io/badge/follow-%40routinator3000-1DA1F2?logo=twitter&style=social
-         :alt: Twitter
-         :target: https://twitter.com/routinator3000/
 
 |
 

doc/manual/source/manual-page.rst

@@ -901,8 +901,8 @@ These can be requested by providing different commands on the command line.
               option is provided, Routinator will run as that user after the
               listening sockets for HTTP and RTR have been created. This may
               cause problems, if the user is not allowed to write to the
-              directory given as repository directory or is not allowed to
-              read the TAL directory or local exception files.
+              directory given as repository directory or local exception
+              files.
 
        .. option:: --group=group-name
 

doc/manual/source/requirements.txt

@@ -3,4 +3,5 @@ sphinx-version-warning==1.1.2
 sphinx-tabs==3.2.0
 sphinx-copybutton==0.4.0
 sphinx-notfound-page
-toml
+sphinx_rtd_theme
+toml