Skip to content

Commit d30d79f

Browse files
committed
fix build by using fpm directly instead of docker-compose
1 parent 0ba0272 commit d30d79f

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

src/ci/before_deploy.sh

+15-7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
echo "Starting Before Deploy step..."
44

55
set -xe
6+
mkdir -p src/packages
67

78
if [ "${CASSANDRA_VERSION}" = "2.1.19" -a "x${GRIM_MIN}" = "x" ]
89
then
@@ -24,12 +25,14 @@ then
2425
cp src/server/target/cassandra-reaper-*.jar cassandra-reaper-master/server/target
2526
cp -R src/packaging/resource cassandra-reaper-master/
2627
tar czf cassandra-reaper-${VERSION}.tar.gz cassandra-reaper-master/
27-
docker-compose -f src/packaging/docker-build/docker-compose.yml build
28-
docker-compose -f src/packaging/docker-build/docker-compose.yml run build > /dev/null
29-
# Renaming the packages to avoid conflicts in Bintray
3028
sudo mv cassandra-reaper-${VERSION}.tar.gz src/packages/
31-
#sudo mv src/packages/reaper_${VERSION}_amd64.deb src/packages/reaper_${VERSION}-${DATE}_amd64.deb
32-
#sudo mv src/packages/reaper-*.x86_64.rpm src/packages/reaper-${RPM_VERSION}.x86_64.rpm
29+
# docker-compose based build stopped working so we fell back to raw fpm
30+
sudo apt-get install ruby ruby-dev build-essential rpm -y
31+
gem install --no-ri --no-rdoc fpm
32+
cd src/packaging
33+
make all
34+
sudo mv reaper_*_amd64.deb ../packages/
35+
sudo mv reaper-*.x86_64.rpm ../packages/
3336
fi
3437
if [ "x${TRAVIS_TAG}" != "x" -a ! -d "cassandra-reaper-${TRAVIS_TAG}" ]
3538
then
@@ -48,7 +51,12 @@ then
4851
cp -R src/packaging/resource cassandra-reaper-${TRAVIS_TAG}/
4952
tar czf cassandra-reaper-${TRAVIS_TAG}-release.tar.gz cassandra-reaper-${TRAVIS_TAG}/
5053
sudo mv cassandra-reaper-${TRAVIS_TAG}-release.tar.gz src/packages/
51-
docker-compose -f src/packaging/docker-build/docker-compose.yml build
52-
docker-compose -f src/packaging/docker-build/docker-compose.yml run build > /dev/null
54+
# docker-compose based build stopped working so we fell back to raw fpm
55+
sudo apt-get install ruby ruby-dev build-essential rpm -y
56+
gem install --no-ri --no-rdoc fpm
57+
cd src/packaging
58+
make all
59+
sudo mv reaper_*_amd64.deb ../packages/
60+
sudo mv reaper-*.x86_64.rpm ../packages/
5361
fi
5462
fi

0 commit comments

Comments
 (0)