Merge pull request #1 from PaulGarneau/master

feat(rpm): add consul rpms [AB#80688]

docker-compose.yml

@@ -2,16 +2,29 @@
 
 version: '3'
 services:
-  centos6:
-    build:
-      context: .
-      dockerfile: ./docker/centos6/Dockerfile
-    volumes:
-      - ./RPMS:/RPMS
+    centos6:
+        environment:
+            - RPMVER
+        build:
+            context: .
+            dockerfile: ./docker/centos6/Dockerfile
+        volumes:
+            - ../centos6:/RPMS
 
-  centos7:
-    build:
-      context: .
-      dockerfile: ./docker/centos7/Dockerfile
-    volumes:
-      - ./RPMS:/RPMS
+    centos7:
+        environment:
+            - RPMVER
+        build:
+            context: .
+            dockerfile: ./docker/centos7/Dockerfile
+        volumes:
+            - ../centos7:/RPMS
+
+    amzn2018:
+        environment:
+            - RPMVER
+        build:
+            context: .
+            dockerfile: ./docker/centos7/Dockerfile
+        volumes:
+            - ../amzn2018:/RPMS

docker/amzn2018/Dockerfile

@@ -0,0 +1,16 @@
+FROM amazonlinux:1
+MAINTAINER Levels Beyond
+
+ENV RPMVER 1.7.2
+
+RUN yum update -y
+RUN yum install -y rpmdevtools mock
+
+RUN cd /root && rpmdev-setuptree
+ADD SOURCES/* /root/rpmbuild/SOURCES/
+ADD SPECS/* /root/rpmbuild/SPECS/
+RUN ln -s /root/rpmbuild/RPMS /RPMS
+
+VOLUME ["/RPMS"]
+
+CMD set -x && cd /root && spectool --define "_version ${RPMVER}" -g -R rpmbuild/SPECS/consul.spec && rpmbuild --define "_version ${RPMVER}" -ba rpmbuild/SPECS/consul.spec

docker/centos6/Dockerfile

@@ -1,6 +1,8 @@
 FROM centos:centos6
 MAINTAINER Sebastien Le Digabel "sledigabel@gmail.com"
 
+ENV RPMVER 1.7.2
+
 RUN yum update -y
 RUN yum install -y rpmdevtools mock
 
@@ -11,4 +13,4 @@ RUN ln -s /root/rpmbuild/RPMS /RPMS
 
 VOLUME ["/RPMS"]
 
-CMD set -x && cd /root && spectool -g -R rpmbuild/SPECS/consul.spec && rpmbuild -ba rpmbuild/SPECS/consul.spec
+CMD set -x && cd /root && spectool --define "_version ${RPMVER}" -g -R rpmbuild/SPECS/consul.spec && rpmbuild --define "_version ${RPMVER}" -ba rpmbuild/SPECS/consul.spec

docker/centos7/Dockerfile

@@ -1,6 +1,8 @@
 FROM centos:centos7
 MAINTAINER Sebastien Le Digabel "sledigabel@gmail.com"
 
+ENV RPMVER 1.7.2
+
 RUN yum update -y
 RUN yum install -y rpmdevtools mock
 
@@ -11,4 +13,4 @@ RUN ln -s /root/rpmbuild/RPMS /RPMS
 
 VOLUME ["/RPMS"]
 
-CMD set -x && cd /root && spectool -g -R rpmbuild/SPECS/consul.spec && rpmbuild -ba rpmbuild/SPECS/consul.spec
+CMD set -x && cd /root && spectool --define "_version ${RPMVER}" -g -R rpmbuild/SPECS/consul.spec && rpmbuild --define "_version ${RPMVER}" -ba rpmbuild/SPECS/consul.spec