Commit 17042b93 authored by omni's avatar omni

community/nomad: upgrade to 1.0.4

- update remove husky patch
- remove static-assets patch, assuming this is not an issue anymore
  https://github.com/elazarl/go-bindata-assetfs/pull/32
parent a0fa41c9
Pipeline #73897 passed with stages
in 16 minutes and 10 seconds
# Contributor: Matthias Neugebauer <mtneug@mailbox.org>
# Contributor: omni <omni+alpine@hack.org>
# Maintainer: Matthias Neugebauer <mtneug@mailbox.org>
pkgname=nomad
pkgver=0.12.7
pkgver=1.0.4 # remember to update GIT_COMMIT below
pkgrel=0
pkgdesc="An easy-to-use, flexible, and performant workload orchestrator"
url="https://www.nomadproject.io/"
......@@ -16,12 +17,14 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/hashicorp/nomad/archive/v$pk
nomad.confd
nvidia-driver.patch
server.hcl
static-assets.patch
ui-remove-husky.patch"
builddir="$srcdir/src/github.com/hashicorp/$pkgname"
# secfixes:
# 1.0.4-r0:
# - CVE-2021-3283
# 0.12.7-r0:
# - CVE-2020-28348
# - CVE-2020-27195
# 0.11.1-r0:
# - CVE-2020-10944
# 0.10.3-r0:
......@@ -36,37 +39,34 @@ builddir="$srcdir/src/github.com/hashicorp/$pkgname"
# 0.9.2-r0:
# - CVE-2019-12618
prepare() {
mkdir -p "$srcdir/src/github.com/hashicorp"
mv "$srcdir"/$pkgname-$pkgver "$builddir"/
default_prepare
}
export GOPATH="$srcdir"
export GOFLAGS="$GOFLAGS -trimpath -mod=readonly -modcacherw"
export GIT_COMMIT="149b150"
build() {
make ember-dist
GOPATH="$srcdir" CGO_ENABLED=1 GO_TAGS="ui release" make static-assets
GOPATH="$srcdir" CGO_ENABLED=1 go build -v -o bin/$pkgname \
GO_TAGS="ui release" make static-assets
go build -v -o bin/"$pkgname" \
-ldflags "-X github.com/hashicorp/nomad/version.GitCommit='$pkgver'" \
-tags "ui release"
}
check() {
GOPATH="$srcdir" CGO_ENABLED=1 go test -timeout=15m "./..."
go test -timeout=15m "./..."
}
package() {
install -m755 -D "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
install -m644 -D "$srcdir/$pkgname.confd" "$pkgdir/etc/conf.d/$pkgname"
install -m755 -D "$srcdir"/"$pkgname".initd "$pkgdir"/etc/init.d/"$pkgname"
install -m644 -D "$srcdir"/"$pkgname".confd "$pkgdir"/etc/conf.d/"$pkgname"
install -m755 -o root -g root -D bin/$pkgname "$pkgdir/usr/sbin/$pkgname"
install -m640 -o root -g root -D "$srcdir/server.hcl" "$pkgdir/etc/nomad.d/server.hcl"
install -m750 -o root -g root -d "$pkgdir/var/lib/$pkgname"
install -m755 -o root -g root -D bin/"$pkgname" "$pkgdir"/usr/sbin/"$pkgname"
install -m640 -o root -g root -D "$srcdir"/server.hcl "$pkgdir"/etc/nomad.d/server.hcl
install -m750 -o root -g root -d "$pkgdir"/var/lib/"$pkgname"
}
sha512sums="7dbc889f444f4e855202abd0ae779bf92c792ab404c86316ead089b4428bbe397e67d1f4e83af8be0e6cafd9160f2f033da7e51070101935ae014a3356d28b21 nomad-0.12.7.tar.gz
sha512sums="935c8a6924434548f65b162c15f9ca14383546a1e0cea0694312f323d776d92863357f82c7ab53408e76c5c966986c0a511eda8a35043cf21c1020634c6e2ae4 nomad-1.0.4.tar.gz
ac969c81150ba57871c1f75f17c11d06ffc7bcc872882416c7c0d9d43f5e352ca1b7e7bfd75e32a9d01a826496c77a657dc298f5e048f85b4d9e85bc3afee51d nomad.initd
a4fcc9f319926e8e5257dcc902cf3e1cbacd8bee82097b7a9719611d52037431a7e953a4b0fa90fc25475d2590cd14877c8e4c87bd909dd0099a754ba6f5063c nomad.confd
e9c0161c2a9c0e1933c266520a410764a709c7b4f65b1a81c1fb2494eae89daa847ffca5df46d6eea61d855f35d21e66433ec0afe8c08017187c917e952b8544 nvidia-driver.patch
c2ba7db5bb0858547bf346819945d24626ac761541f38350b40408e1b26227549f6aa4d6946baadbf856329c0ac9f81f84164597d11361224b62a1697f17e726 server.hcl
c2ef7b4bb818fc334c497cb2c6cb7283051c2ffa78de4dc228f32ffd9a3c91596c9685058ce3037309dcc59fd02d57deac4d8ae60578c9501752ef6adddd236d static-assets.patch
904268431358cdb3e2172cb77e8ef952d337fe8213f5b1973275f4e240a75185fb0963dfb59ae2ad2927bb994cda4e9fa63656e0d23fd21eb44f4e1649bed9a5 ui-remove-husky.patch"
3334cab1f9fa8bd442f004cea08f33715d06466dfb9ec866b20dd37cced827dad24ec39302637067b54c11721d04dedbd2af00c7fd6e8cc5a9940823453f8ac5 ui-remove-husky.patch"
This patch removes the custom output name option that is handled properly only
in the master branch of go-bindata-assetfs (see https://github.com/elazarl/go-bindata-assetfs/pull/32)
diff --git a/GNUmakefile b/GNUmakefile
index 311faf6..770e136 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -345,8 +345,8 @@ testcluster: ## Bring up a Linux test cluster using Vagrant. Set PROVIDER if nec
.PHONY: static-assets
static-assets: ## Compile the static routes to serve alongside the API
@echo "--> Generating static assets"
- @go-bindata-assetfs -pkg agent -prefix ui -modtime 1480000000 -tags ui -o bindata_assetfs.go ./ui/dist/...
- @mv bindata_assetfs.go command/agent
+ @go-bindata-assetfs -pkg agent -prefix ui -modtime 1480000000 -tags ui ./ui/dist/...
+ @mv bindata.go command/agent/bindata_assetfs.go
.PHONY: test-ui
test-ui: ## Run Nomad UI test suite
......@@ -6,7 +6,7 @@ diff --git a/ui/package.json b/ui/package.json
index 0fcd03deae..6c7ae337bf 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -101,7 +101,6 @@
@@ -109,7 +109,6 @@
"fuse.js": "^3.4.4",
"glob": "^4.0.5",
"http-proxy": "^1.1.6",
......@@ -18,26 +18,26 @@ diff --git a/ui/yarn.lock b/ui/yarn.lock
index 8b5bbec3a6..7dc013d78e 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -9306,22 +9306,6 @@
@@ -9683,22 +9683,6 @@ human-signals@^1.1.1:
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
-husky@^4.2.5:
- version "4.2.5"
- resolved "https://registry.yarnpkg.com/husky/-/husky-4.2.5.tgz#2b4f7622673a71579f901d9885ed448394b5fa36"
- integrity sha512-SYZ95AjKcX7goYVZtVZF2i6XiZcHknw50iXvY7b0MiGoj5RwdgRQNEHdb+gPDPCXKlzwrybjFjkL6FOj8uRhZQ==
- version "4.3.8"
- resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz#31144060be963fd6850e5cc8f019a1dfe194296d"
- integrity sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow==
- dependencies:
- chalk "^4.0.0"
- ci-info "^2.0.0"
- compare-versions "^3.6.0"
- cosmiconfig "^6.0.0"
- find-versions "^3.2.0"
- cosmiconfig "^7.0.0"
- find-versions "^4.0.0"
- opencollective-postinstall "^2.0.2"
- pkg-dir "^4.2.0"
- pkg-dir "^5.0.0"
- please-upgrade-node "^3.2.0"
- slash "^3.0.0"
- which-pm-runs "^1.0.0"
-
iconv-lite@0.4.23:
version "0.4.23"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
iconv-lite@0.4.24, iconv-lite@^0.4.24:
version "0.4.24"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment