Skip to content

Commit c5b638e

Browse files
authored
Add java runtime as a package dependency (deb/rpm)
cherry pick strapdata#2
1 parent 93d8245 commit c5b638e

File tree

3 files changed

+5
-75
lines changed

3 files changed

+5
-75
lines changed

distribution/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ buildscript {
3737
}
3838
}
3939
dependencies {
40-
classpath 'com.netflix.nebula:gradle-ospackage-plugin:3.4.0'
40+
classpath 'com.netflix.nebula:gradle-ospackage-plugin:3.6.0'
4141
}
4242
}
4343

@@ -515,11 +515,13 @@ configure(distributions.findAll { ['deb', 'rpm'].contains(it.name) }) {
515515
if (project.name == 'rpm') {
516516
requires('/bin/bash')
517517
requires('python', '2.7', GREATER | EQUAL)
518+
requires('jre', "1.8.0", GREATER | EQUAL)
518519
recommends('ntp')
519520
conflicts('cassandra')
520521
} else if (project.name == 'deb') {
521522
requires('bash')
522523
requires('python', '2.7', GREATER | EQUAL)
524+
requires('openjdk-8-jre-headless').or("java8-runtime")
523525
recommends('ntp')
524526
conflicts('cassandra')
525527
}

docs/elassandra/source/install_deb.rst

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,8 @@
11

2-
Our packages are hosted on `packagecloud.io <https://packagecloud.io/elassandra>`_.
3-
Elassandra can be downloaded using an APT repository.
4-
5-
.. note:: Elassandra requires Java 8 to be installed.
6-
7-
Import the GPG Key
8-
..................
9-
10-
Download and install the public signing key::
11-
12-
curl -L https://packagecloud.io/elassandra/latest/gpgkey | sudo apt-key add -
13-
14-
Install Elassandra from the APT repository
15-
..............................................
16-
17-
Ensure apt is able to use https::
18-
19-
sudo apt-get install apt-transport-https
20-
21-
Add the Elassandra repository to your source list::
22-
23-
echo "deb https://packagecloud.io/elassandra/latest/debian jessie main" | sudo tee -a /etc/apt/sources.list.d/elassandra.list
24-
25-
Update apt cache and install Elassandra::
26-
27-
sudo apt-get update
28-
sudo apt-get install elassandra
29-
2+
Debian based packages are available from the github `release page <https://github.com/strapdata/elassandra/releases>`_.
303

314
.. warning:: You should uninstall Cassandra prior to install Elassandra cause the two packages conflict.
325

33-
Install extra tools
34-
...................
35-
36-
Also install Python, pip, and cassandra-driver::
37-
38-
sudo apt-get update && sudo apt-get install python python-pip
39-
sudo pip install cassandra-driver
40-
416
Usage
427
.....
438

docs/elassandra/source/install_rpm.rst

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,4 @@
1-
Our packages are hosted on `packagecloud.io <https://packagecloud.io/elassandra>`_.
2-
Elassandra can be downloaded using a RPM repository.
3-
4-
.. note:: Elassandra requires Java 8 to be installed.
5-
6-
Setup the RPM repository
7-
..........................................
8-
9-
Create a file called ``elassandra.repo`` in the directory ``/etc/yum.repos.d/`` (redhat) or ``/etc/zypp/repos.d/`` (opensuse), containing::
10-
11-
[elassandra_latest]
12-
name=Elassandra repository
13-
baseurl=https://packagecloud.io/elassandra/latest/el/7/$basearch
14-
type=rpm-md
15-
repo_gpgcheck=1
16-
gpgcheck=0
17-
enabled=1
18-
gpgkey=https://packagecloud.io/elassandra/latest/gpgkey
19-
autorefresh=1
20-
sslverify=1
21-
sslcacert=/etc/pki/tls/certs/ca-bundle.crt
22-
23-
Install Elassandra
24-
..................
25-
26-
Using yum::
27-
28-
sudo yum install elassandra
29-
30-
.. warning:: You should uninstall Cassandra prior to install Elassandra cause the two packages conflict.
31-
32-
Install extra tools
33-
...................
34-
35-
Also install Python, pip, and cassandra-driver::
36-
37-
sudo yum install python python-pip
38-
sudo pip install cassandra-driver
1+
RPM packages are available from the github `release page <https://github.com/strapdata/elassandra/releases>`_.
392

403
Usage
414
.....

0 commit comments

Comments
 (0)