diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-01-22 18:53:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-22 18:53:16 +0100 |
| commit | a62f74c6dbcc329c53898f9cac01f979dd792500 (patch) | |
| tree | 1c63cea8aa004a967009506e48ef2b82a534cf11 | |
| parent | d1516da228f7da3fdb70073365ab070726181505 (diff) | |
| parent | f2c5772665a1a7b737ce90e603600cfdc55e9aaa (diff) | |
| download | vyos-build-a62f74c6dbcc329c53898f9cac01f979dd792500.tar.gz vyos-build-a62f74c6dbcc329c53898f9cac01f979dd792500.zip | |
Merge pull request #295 from c-po/t4875-backport
Docker: T4798: add OCaml package fileutils (equuleus)
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 20 | ||||
| -rw-r--r-- | docker/Dockerfile | 3 |
2 files changed, 17 insertions, 6 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index cc5e2f53..17d457ce 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,12 +1,15 @@ <!-- All PR should follow this template to allow a clean and transparent review --> -<!-- Text placed between these delimiters is considered a commend and is not rendered --> +<!-- Text placed between these delimiters is considered a comment and is not rendered --> ## Change Summary <!--- Provide a general summary of your changes in the Title above --> ## Types of changes -<!--- What types of changes does your code introduce? Put an 'x' in all the boxes that apply. --> -<!--- NOTE: Markdown requires no leading or trailing whitespace inside the [ ] for checking the box, please use [x] --> +<!--- +What types of changes does your code introduce? Put an 'x' in all the boxes that apply. +NOTE: Markdown requires no leading or trailing whitespace inside the [ ] for checking +the box, please use [x] +--> - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Code style update (formatting, renaming) @@ -16,6 +19,7 @@ ## Related Task(s) <!-- All submitted PRs must be linked to a Task on Phabricator. --> +* https://phabricator.vyos.net/Txxxx ## Component(s) name <!-- A rather incomplete list of components: ethernet, wireguard, bgp, mpls, ldp, l2tp, dhcp ... --> @@ -24,8 +28,14 @@ <!--- Describe your changes in detail --> ## How to test -<!--- Please describe in detail how you tested your changes. --> -<!--- Include details of your testing environment, and the tests you ran to --> +<!--- +Please describe in detail how you tested your changes. Include details of your testing +environment, and the tests you ran. When pasting configs, logs, shell output, backtraces, +and other large chunks of text, surround this text with triple backtics +``` +like this +``` +--> ## Checklist: <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> diff --git a/docker/Dockerfile b/docker/Dockerfile index b45572d2..f0a000c5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -134,7 +134,8 @@ RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ ctypes.0.16.0 \ ctypes-foreign \ ctypes-build \ - containers + containers \ + fileutils # Build VyConf which is required to build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ |