[arch-commits] Commit in nomad/trunk (PKGBUILD defaults.hcl nomad.hcl tmpfiles.conf)

[George Rawlinson]

    Date: Sunday, June 20, 2021 @ 09:50:49
  Author: grawlinson
Revision: 965878

update configuration, not ready for release

Added:
  nomad/trunk/defaults.hcl
Modified:
  nomad/trunk/PKGBUILD
  nomad/trunk/tmpfiles.conf
Deleted:
  nomad/trunk/nomad.hcl

---------------+
 PKGBUILD      |   30 ++++++++++++------------------
 defaults.hcl  |    7 +++++++
 nomad.hcl     |    1 -
 tmpfiles.conf |    1 +
 4 files changed, 20 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-20 08:50:00 UTC (rev 965877)
+++ PKGBUILD	2021-06-20 09:50:49 UTC (rev 965878)
@@ -2,7 +2,7 @@
 
 pkgname=nomad
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple and flexible workload orchestrator"
 arch=('x86_64')
 url="https://www.nomadproject.io"
@@ -9,30 +9,26 @@
 license=('MPL2')
 depends=('glibc' 'iptables')
 makedepends=('go' 'git')
-# additonal drivers:
-# podman: https://github.com/hashicorp/nomad-driver-podman
-# containerd: https://github.com/Roblox/nomad-driver-containerd
-# firecracker: https://github.com/firecracker-microvm/firecracker
-# lxc: https://github.com/hashicorp/nomad-driver-lxc
-# amazon-ecs (experimental): https://github.com/hashicorp/nomad-driver-ecs
-# singularity: https://github.com/hpcng/nomad-driver-singularity
-# systemd-nspawn: https://github.com/JanMa/nomad-driver-nspawn
 optdepends=(
   'docker: for docker driver'
   'java-runtime: for java driver'
   'qemu: for qemu driver'
+  'nomad-driver-nspawn: for systemd-nspawn driver'
+  'nomad-driver-podman: for podman driver'
+  'nomad-driver-lxc: for lxc driver'
+  'nomad-driver-containerd: for containerd driver'
 )
-backup=(etc/nomad.d/nomad.hcl)
+backup=(etc/nomad.d/defaults.hcl)
 source=(
   "$pkgname-$pkgver.tar.gz::https://github.com/hashicorp/nomad/archive/v$pkgver.tar.gz"
   'systemd.service'
   'tmpfiles.conf'
-  'nomad.hcl'
+  'defaults.hcl'
 )
 b2sums=('85384697dc3da8846804e1e116b9048a662b90c1942254959f564da806a9cab7f42140f4c6947a5ccb02550b0b6902bde15c0fc607b32894ee5efb0f1ca95062'
         '0f931868e9d7465f3be176ab789b7c7b5a4c35713a82e4d3bb94460254011779d814d4708f4f8cc76ba0dd1928ac7eeda42e01ed43be675a5d26d0b75ba986b9'
-        '464963ce700e41b081af414e36e0c255cfea9b4fa55cb34d892bfd70da6ece92d273dfee9cd542918bb2852b99bdc9cde1b082a8c4de6f1ce0024b534843c3d2'
-        '6050c07db88d1c3433915ad5733b43d7c4f4b32172e65915e0421693f8b78012ae7bb8b2e3cfa0bb9d49101db4f0ec2ca3d460ba984382ff4d48dd0b6ddc600d')
+        '93abad92a38c9a398d4e9fda448dc058d6d65ca24e0ee93a556a71e789ea9bc0cefc00679959e6cb2b2ad75818bf7ad06aa383b3fc524215d060c5ac1f86c08e'
+        'abbf4c69d70e03b318f73ef84ccf258e39b25ac956ec68c82bebe277662ddd1677719c3b693c04a8cc38554c562a127aa2ba4061e20e594440d432d729bab3b3')
 
 prepare() {
 	cd "$pkgname-$pkgver"
@@ -45,10 +41,8 @@
 # REFERENCE: https://salsa.debian.org/go-team/packages/nomad
 
 build() {
-  # TODO find out if `make bootstrap` is actually required
-  # FIXME remove nonvidia for actual releases ...
-  # TODO find out what codegen_generated actually does
-  local GO_TAGS="ui release codegen_generated nonvidia"
+  # nonvidia: https://github.com/hashicorp/nomad/issues/8330
+  local GO_TAGS="ui release nonvidia"
 	cd "$pkgname-$pkgver"
   CGO_ENABLED=1 go build -v \
     -buildmode=pie \
@@ -65,7 +59,7 @@
   install -vDm755 -t "$pkgdir/usr/bin" "$pkgname-$pkgver/build/$pkgname"
 
   # configuration
-  install -vDm644 -t "$pkgdir/etc/nomad.d" nomad.hcl
+  install -vDm644 -t "$pkgdir/etc/nomad.d" defaults.hcl
 
   # systemd integration
   install -vDm644 systemd.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"

Added: defaults.hcl
===================================================================
--- defaults.hcl	                        (rev 0)
+++ defaults.hcl	2021-06-20 09:50:49 UTC (rev 965878)
@@ -0,0 +1,7 @@
+## https://www.nomadproject.io/docs/agent/configuration/index.html
+
+# state directory
+data_dir = "/var/lib/nomad"
+
+# binaries shouldn't go in /var/lib
+plugin_dir = "/usr/lib/nomad/plugins"

Deleted: nomad.hcl
===================================================================
--- nomad.hcl	2021-06-20 08:50:00 UTC (rev 965877)
+++ nomad.hcl	2021-06-20 09:50:49 UTC (rev 965878)
@@ -1 +0,0 @@
-data_dir = "/var/lib/nomad"

Modified: tmpfiles.conf
===================================================================
--- tmpfiles.conf	2021-06-20 08:50:00 UTC (rev 965877)
+++ tmpfiles.conf	2021-06-20 09:50:49 UTC (rev 965878)
@@ -1 +1,2 @@
 d /var/lib/nomad 0700
+d /usr/lib/nomad