Updated to use docker builder

jasonmcintosh · Apr 17, 2019 · b8c9317 · b8c9317
1 parent ea71613
commit b8c9317
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,5 @@ See [GitHub releases](https://github.com/jasonmcintosh/esl-erlang-compat/release
 ## Building new RPMs
 Command (with the right tools installed) to build:
 ```
-cd rpmbuilds 
-rpmbuild -ba SPECS/esl-erlang-compat.spec 
-mv ~/rpmbuilds/RPMS/noarch/esl-erlang-compat-19.3.6-1.noarch.rpm ./RPMS/noarch
+docker run -e "VERSION=1.2.3" -v $(pwd):/srv -v $(pwd):/home/builder rpmbuild/centos7
 ```
diff --git a/pkg b/pkg
@@ -0,0 +1,2 @@
+cd ~/
+rpmbuild -ba rpmbuild/SPECS/esl-erlang-compat.spec 
diff --git a/rpmbuild/RPMS/noarch/esl-erlang-compat-20.2.2-1.noarch.rpm b/rpmbuild/RPMS/noarch/esl-erlang-compat-20.2.2-1.noarch.rpm
diff --git a/rpmbuild/RPMS/noarch/esl-erlang-compat-20.3.8.20-1.noarch.rpm b/rpmbuild/RPMS/noarch/esl-erlang-compat-20.3.8.20-1.noarch.rpm
diff --git a/rpmbuild/RPMS/noarch/esl-erlang-compat-21.2.6-1.noarch.rpm b/rpmbuild/RPMS/noarch/esl-erlang-compat-21.2.6-1.noarch.rpm
diff --git a/rpmbuild/SPECS/esl-erlang-compat.spec b/rpmbuild/SPECS/esl-erlang-compat.spec
@@ -1,11 +1,11 @@
 Name: esl-erlang-compat
-Version: 20.2.2
+Version: %{getenv:VERSION}
 Release: 1
 Summary: A compat file to get esl-erlang to provide erlang
 URL:  https://github.com/jasonmcintosh/esl-erlang-compat
 License: MPLv1.1 and MIT and ASL 2.0 and BSD
 BuildArch: noarch
-Requires: esl-erlang >= 20.2.2
+Requires: esl-erlang >= %{getenv:VERSION}
 Provides: erlang
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -21,6 +21,9 @@ A shim (compatibility) package to allow esl-erlang to provide an erlang package
 %files
 
 %changelog
+* Tue Feb 20 2018 Jason McIntosh <[email protected]>
+- Updated to use environment variables for version and docker builder
+
 * Tue Feb 20 2018 Michael Klishin <[email protected]>
 - Updated to use 20.2.2 as minimum version
 

diff --git a/rpmbuild/SRPMS/esl-erlang-compat-20.2.2-1.src.rpm b/rpmbuild/SRPMS/esl-erlang-compat-20.2.2-1.src.rpm
diff --git a/rpmbuild/SRPMS/esl-erlang-compat-20.3.8.20-1.src.rpm b/rpmbuild/SRPMS/esl-erlang-compat-20.3.8.20-1.src.rpm
diff --git a/rpmbuild/SRPMS/esl-erlang-compat-21.2.6-1.src.rpm b/rpmbuild/SRPMS/esl-erlang-compat-21.2.6-1.src.rpm
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		cd ~/
		rpmbuild -ba rpmbuild/SPECS/esl-erlang-compat.spec