updpkg: kaniko 0.24.0-2

2 files changed, 49 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 10c0ba6e951e..7599f25387e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = kaniko
-	pkgdesc = A tool to build container images from a Dockerfile, inside a container or Kubernetes cluster
+	pkgdesc = Build Container Images In Kubernetes
 	pkgver = 0.24.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/GoogleContainerTools/kaniko
-	arch = any
-	license = APACHE
-	depends = docker
-	depends = google-cloud-sdk
-	source = kaniko-0.24.0.tar.gz::https://github.com/GoogleContainerTools/kaniko/archive/v0.24.0.tar.gz
+	arch = x86_64
+	license = Apache
+	makedepends = go
+	depends = glibc
+	optdepends = bash: run_in_docker.sh script
+	source = https://github.com/GoogleContainerTools/kaniko/archive/v0.24.0/kaniko-0.24.0.tar.gz
 	sha256sums = e79a6184f21331204d9438e2e0d4bd34ad86c70f7376579502f92483081c89c6
 
 pkgname = kaniko
diff --git a/PKGBUILD b/PKGBUILD
index eaed4ae1bc47..abb3814314e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,46 @@
-# Maintainer: Fredy García <frealgagu at gmail dot com>
-
+# Maintainer: Matthias Lisin <ml@visu.li>
+# Contributor: Fredy García <frealgagu at gmail dot com>
 pkgname=kaniko
 pkgver=0.24.0
-pkgrel=1
-pkgdesc="A tool to build container images from a Dockerfile, inside a container or Kubernetes cluster"
-arch=("any")
-url="https://github.com/GoogleContainerTools/${pkgname}"
-license=("APACHE")
-depends=("docker" "google-cloud-sdk")
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/GoogleContainerTools/${pkgname}/archive/v${pkgver}.tar.gz")
-sha256sums=("e79a6184f21331204d9438e2e0d4bd34ad86c70f7376579502f92483081c89c6")
+pkgrel=2
+pkgdesc='Build Container Images In Kubernetes'
+arch=('x86_64')
+url="https://github.com/GoogleContainerTools/kaniko"
+license=('Apache')
+depends=('glibc')
+optdepends=('bash: run_in_docker.sh script')
+makedepends=('go')
+source=("$url/archive/v$pkgver/$pkgname-$pkgver.tar.gz")
+sha256sums=('e79a6184f21331204d9438e2e0d4bd34ad86c70f7376579502f92483081c89c6')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+  go mod download
+}
+
+build() {
+  cd "${pkgname}-${pkgver}"
+  export CGO_ENABLED=1
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CPPFLAGS="$CPPFLAGS"
+  export CGO_CXXFLAGS="$CXXFLAGS"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS='-buildmode=pie -modcacherw -mod=readonly'
+  go build -trimpath -o . -ldflags="-X=github.com/GoogleContainerTools/kaniko/pkg/version.version=$pkgver" ./cmd/...
+}
+
+check() {
+  cd "${pkgname}-${pkgver}"
+  # custom umask values make tests fail. set to default
+  umask 0022
+  go test -short ./{cmd,pkg}/...
+}
 
 package() {
-  install -Dm755 "${srcdir}/${pkgname}-${pkgver}/run_in_docker.sh" "${pkgdir}/usr/bin/${pkgname}"
+  cd "${pkgname}-${pkgver}"
+  install -Dm755 executor warmer -t "$pkgdir/usr/lib/$pkgname"
+  install -dm755 "$pkgdir/usr/bin"
+  ln -sT /usr/lib/$pkgname/executor "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 README.md -t "$pkgdir/usr/share/doc/$pkgname"
+  cp -a docs examples deploy run_in_docker.sh -t "$pkgdir/usr/share/doc/$pkgname"
 }