Fixes to build system

sevagh · Aug 14, 2023 · dfe8a00 · dfe8a00
1 parent 14774e9
commit dfe8a00
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile.build b/Dockerfile.build
@@ -1,4 +1,4 @@
-FROM golang:1.12-stretch as build
+FROM golang:1.21-bullseye as build
 
 RUN apt-get update -y &&\
 	apt-get install -y zip 
@@ -11,7 +11,7 @@ RUN make build zip tarball
 FROM fedora as rpmbuild
 
 RUN dnf update -y &&\
-	dnf install -y make rpm-build alien
+	dnf install -y make rpm-build alien systemd-rpm-macros
 
 COPY ./rpm /goat-rpm-pkg/
 

diff --git a/GNUmakefile b/GNUmakefile
@@ -11,7 +11,7 @@ all: build
 
 docker-build:
 	mkdir -p $(PKGDIR)
-	docker build -q -t "goat-builder" -f Dockerfile.build .
+	docker build -t "goat-builder" -f Dockerfile.build .
 	docker run -v $(PKGDIR):/goat-pkg goat-builder
 
 build:

diff --git a/rpm/specfile.spec b/rpm/specfile.spec
@@ -4,6 +4,7 @@ Name: %{pkgname}
 Version: %{_version}
 Release: 1%{?dist}
 Summary: Attach and mount EBS and ENI
+BuildRequires: systemd-rpm-macros
 
 License: BSD 3-clause
 URL: https://github.com/sevagh/goat