diff options
| -rw-r--r-- | .SRCINFO | 11 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | PKGBUILD | 26 | ||||
| -rw-r--r-- | do-agent.service | 3 |
4 files changed, 22 insertions, 20 deletions
@@ -1,15 +1,14 @@ pkgbase = do-agent pkgdesc = DigitalOcean Agent for Enhanced Droplet Graphs - pkgver = 3.5.6 + pkgver = 3.16.7 pkgrel = 1 url = https://github.com/digitalocean/do-agent arch = x86_64 license = Apache - makedepends = docker - source = https://github.com/digitalocean/do-agent/archive/3.5.6.tar.gz + makedepends = go + source = https://github.com/digitalocean/do-agent/archive/3.16.7.tar.gz source = do-agent.service - sha512sums = e0007dcc8df3eb5f217e8db0b8dc9696c5b8557090712254f2b91e6d7e9c94321141d2fcc9cd13dc0153d3f76c966b968818a1ff01130a561cb97765edf840a5 - sha512sums = 19d040ae8a75a73a86c1b473983ecf84410fc6a24a7f9142e98dc00c6dbda1ff1f2e2caec0d37bb3c6f557133644ea91f49a75697f5c4bdc23af56407d1fbcaa + sha512sums = 0647cfe6f56c9da779c89261bb82219dad3db62847c67edfa883704a25c25534cec648c289c19d883cfcf1b59d61c9dba505f76e82e427a61a7d6730091cbb41 + sha512sums = 3758a5d63c12db885d54829f67ce62a00ce0155c0d292969fcbb7d9177666fc499d1d5c37c05424fd6684ee793d2c93ddd442948805b313f23af12b97bcd695b pkgname = do-agent - diff --git a/.gitignore b/.gitignore index 02f681f2f1c3..c93a7e83d427 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /*.deb /*.tar.gz /*.tar.xz +/*.tar.zst +/*.log @@ -1,12 +1,12 @@ # Author: Kyle Manna <kyle at kylemanna dot com> pkgname=do-agent -pkgver=3.5.6 +pkgver=3.16.7 pkgrel=1 pkgdesc='DigitalOcean Agent for Enhanced Droplet Graphs' url='https://github.com/digitalocean/do-agent' arch=('x86_64') -makedepends=('docker') +makedepends=('go') depends=() license=('Apache') @@ -14,24 +14,26 @@ license=('Apache') source=("https://github.com/digitalocean/${pkgname}/archive/${pkgver}.tar.gz" "do-agent.service") -sha512sums=('e0007dcc8df3eb5f217e8db0b8dc9696c5b8557090712254f2b91e6d7e9c94321141d2fcc9cd13dc0153d3f76c966b968818a1ff01130a561cb97765edf840a5' - '19d040ae8a75a73a86c1b473983ecf84410fc6a24a7f9142e98dc00c6dbda1ff1f2e2caec0d37bb3c6f557133644ea91f49a75697f5c4bdc23af56407d1fbcaa') +sha512sums=('0647cfe6f56c9da779c89261bb82219dad3db62847c67edfa883704a25c25534cec648c289c19d883cfcf1b59d61c9dba505f76e82e427a61a7d6730091cbb41' + '3758a5d63c12db885d54829f67ce62a00ce0155c0d292969fcbb7d9177666fc499d1d5c37c05424fd6684ee793d2c93ddd442948805b313f23af12b97bcd695b') prepare() { - cd "$srcdir" - mkdir -p go/src/github.com/digitalocean - mv "$srcdir/$pkgname-$pkgver" "$srcdir/go/src/github.com/digitalocean/$pkgname" - ln -s "$srcdir/go/src/github.com/digitalocean/$pkgname" "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" + mkdir -p build/ } build() { - cd "$srcdir/go/src/github.com/digitalocean/$pkgname" - export GOPATH=$srcdir/go - make VERSION=${pkgver} build + cd "$pkgname-$pkgver" + export CGO_LDFLAGS="${LDFLAGS}" + export CGO_CFLAGS="${CFLAGS}" + export CGO_CPPFLAGS="${CPPFLAGS}" + export CGO_CXXFLAGS="${CXXFLAGS}" + export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw" + go build -ldflags "-s -w -X \"main.version=${pkgver}\" -X \"main.buildDate=$(date -u)\"" -o build ./cmd/do-agent } package() { install -d $pkgdir/usr/{bin,lib/systemd/system} - install -Dm755 "$srcdir/$pkgname-$pkgver/target/do-agent-linux-amd64" "$pkgdir/usr/bin/do-agent" + install -Dm755 "$srcdir/$pkgname-$pkgver/build/do-agent" "$pkgdir/usr/bin/do-agent" install -Dm644 "$srcdir/do-agent.service" "$pkgdir/usr/lib/systemd/system/do-agent.service" } diff --git a/do-agent.service b/do-agent.service index 0163d19084b2..0051654f671a 100644 --- a/do-agent.service +++ b/do-agent.service @@ -4,8 +4,7 @@ After=network-online.target Wants=network-online.target [Service] -User=nobody -Group=nobody +DynamicUser=yes ExecStart=/usr/bin/do-agent [Install] |