From e7d2f63d457843e6423077f50fbc95b838a848e0 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Sun, 6 Nov 2022 08:32:18 -0600
Subject: Docker: T4798: add OCaml package fileutils

The package fileutils is required for the file path validator.

(cherry picked from commit 55758811bc6f06fa579f502b4a4705e37281e359)
---
 docker/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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) && \
-- 
cgit v1.2.3


From f2c5772665a1a7b737ce90e603600cfdc55e9aaa Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sat, 21 Jan 2023 20:03:05 +0100
Subject: GitHub: update PullRequest template

(cherry picked from commit ac73adf9c19b4ec5831a0989f34faa25def17d58)
---
 .github/PULL_REQUEST_TEMPLATE.md | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 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. -->
-- 
cgit v1.2.3