zlib dep, build script fixes, v0.2

ohwgiles · Dec 6, 2015 · 9521ba0 · 9521ba0
1 parent 82b39c2
commit 9521ba0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/docker-build-centos.sh b/docker-build-centos.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-VERSION=0.1
+VERSION=0.2
 
 OUTPUT_DIR=$PWD
 
 SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 
 docker run --rm -i -v $SOURCE_DIR:/root/rpmbuild/SOURCES/laminar-$VERSION:ro -v $OUTPUT_DIR:/output centos bash -xe <<EOS
 
-yum -y install rpm-build cmake make gcc gcc-c++ wget sqlite-devel boost-devel
+yum -y install rpm-build cmake make gcc gcc-c++ wget sqlite-devel boost-devel zlib-devel
 
 mkdir /build
 cd /build
@@ -47,15 +47,15 @@ Version: $VERSION
 Release: 1
 License: GPL
 BuildRequires: systemd-units
-Requires: boost-filesystem
+Requires: boost-filesystem zlib
 
 %description
 Lightweight Continuous Integration Service
 
 %prep
 
 %build
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ %{_sourcedir}/laminar-0.1
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ %{_sourcedir}/laminar-$VERSION
 pwd
 make
 
@@ -76,5 +76,5 @@ chown -R laminar: %{_sharedstatedir}/laminar
 EOF
 
 rpmbuild -ba laminar.spec
-mv rpmbuild/RPMS/x86_64/laminar-0.1-1.x86_64.rpm /output/
+mv rpmbuild/RPMS/x86_64/laminar-$VERSION-1.x86_64.rpm /output/
 EOS
diff --git a/docker-build-ubuntu.sh b/docker-build-ubuntu.sh
@@ -1,16 +1,15 @@
 #!/bin/bash
 
-VERSION=0.1
+VERSION=0.2
 
 OUTPUT_DIR=$PWD
 
 SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 
-#docker run --rm -i -v $SOURCE_DIR:/laminar:ro -v $OUTPUT_DIR:/output ubuntu bash -xe <<EOS
-docker run -i -v $SOURCE_DIR:/laminar:ro -v $OUTPUT_DIR:/output ubuntu bash -xe <<EOS
+docker run --rm -i -v $SOURCE_DIR:/laminar:ro -v $OUTPUT_DIR:/output ubuntu bash -xe <<EOS
 
 apt-get update
-apt-get install -y wget cmake g++ libsqlite3-dev libboost-filesystem1.55-dev
+apt-get install -y wget cmake g++ libsqlite3-dev libboost-filesystem1.55-dev zlib1g-dev
 
 mkdir /build
 cd /build
@@ -55,7 +54,7 @@ Section:
 Priority: optional
 Architecture: amd64
 Maintainer: Oliver Giles <web ohwg net>
-Depends: libboost-filesystem1.55.0
+Depends: libboost-filesystem1.55.0, zlib1g
 Description: Lightweight Continuous Integration Service
 EOF
 cat <<EOF > laminar/DEBIAN/postinst