diff options
| m--------- | docs/_include/vyos-1x | 0 | ||||
| -rw-r--r-- | docs/changelog/1.3.rst | 6 | ||||
| -rw-r--r-- | docs/contributing/build-vyos.rst | 28 |
3 files changed, 21 insertions, 13 deletions
diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x -Subproject 8d11722f1829ec0bff048d7b1911ec6c96d1aa3 +Subproject da4006c2a784ff06cf3af3aad6adee7fef8a533 diff --git a/docs/changelog/1.3.rst b/docs/changelog/1.3.rst index 13fdac6f..601420a1 100644 --- a/docs/changelog/1.3.rst +++ b/docs/changelog/1.3.rst @@ -8,6 +8,12 @@ _ext/releasenotes.py +2023-09-20 +========== + +* :vytask:`T5271` (default): Add support for peer-fingerprint to OpenVPN + + 2023-09-11 ========== diff --git a/docs/contributing/build-vyos.rst b/docs/contributing/build-vyos.rst index 2f08c68a..2ab9b13c 100644 --- a/docs/contributing/build-vyos.rst +++ b/docs/contributing/build-vyos.rst @@ -50,19 +50,21 @@ Installing Docker_ and prerequisites: .. code-block:: bash - sudo apt-get update - sudo apt-get -y install \ - ca-certificates \ - curl \ - gnupg \ - lsb-release - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg - echo \ - "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \ - $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null - sudo apt-get update - sudo apt-get install docker-ce docker-ce-cli containerd.io - + # Add Docker's official GPG key: + sudo apt-get update + sudo apt-get install ca-certificates curl gnupg + sudo install -m 0755 -d /etc/apt/keyrings + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg + sudo chmod a+r /etc/apt/keyrings/docker.gpg + + # Add the repository to Apt sources: + echo \ + "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \ + "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \ + sudo tee /etc/apt/sources.list.d/docker.list > /dev/null + sudo apt-get update + sudo apt-get install docker-ce docker-ce-cli containerd.io + `On Fedora`_ |