apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-9710: Switch to JRE1.8

Browse Source 
- Switches Travis to use jdk1.8
- Changes java-version to 1.8
- Change jdk/maven version to 1.8
- Switch to F5/java8 compatible library release
- Switch packaging to use jdk 1.8, and jre 1.8 in init/systemd scripts
- Switch systemvm to openjdk-8-jre

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2017-01-04 22:45:43 +05:30
parent 729ae6d186
commit e6cc78f531
19 changed files with 55 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.java-version
View File

@ -1 +1 @@
1.7 1.8

2
.travis.yml
View File

@ -18,7 +18,7 @@ sudo: required
dist: trusty dist: trusty
language: java language: java
jdk: jdk:
- oraclejdk7 - oraclejdk8
python: python:
- "2.7" - "2.7"
cache: cache:

8
debian/control vendored
View File

@ -2,7 +2,7 @@ Source: cloudstack
Section: libs Section: libs
Priority: extra Priority: extra
Maintainer: Wido den Hollander <wido@widodh.nl> Maintainer: Wido den Hollander <wido@widodh.nl>
Build-Depends: debhelper (>= 9), openjdk-8-jdk | java8-sdk | java8-jdk | openjdk-7-jdk, genisoimage, Build-Depends: debhelper (>= 9), openjdk-8-jdk | java8-sdk | java8-jdk, genisoimage,
python-mysql.connector, maven (>= 3) | maven3, python (>= 2.7), lsb-release, dh-systemd python-mysql.connector, maven (>= 3) | maven3, python (>= 2.7), lsb-release, dh-systemd
Standards-Version: 3.8.1 Standards-Version: 3.8.1
Homepage: http://www.cloudstack.org/ Homepage: http://www.cloudstack.org/
@ -15,14 +15,14 @@ Description: A common package which contains files which are shared by several C
Package: cloudstack-management Package: cloudstack-management
Architecture: all Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, cloudstack-common (= ${source:Version}), tomcat6 | tomcat7, sudo, jsvc, python-mysql.connector, libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, lsb-release Depends: ${misc:Depends}, ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime, cloudstack-common (= ${source:Version}), tomcat6 | tomcat7, sudo, jsvc, python-mysql.connector, libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, lsb-release
Conflicts: cloud-server, cloud-client, cloud-client-ui Conflicts: cloud-server, cloud-client, cloud-client-ui
Description: CloudStack server library Description: CloudStack server library
The CloudStack management server The CloudStack management server
Package: cloudstack-agent Package: cloudstack-agent
Architecture: all Architecture: all
Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-7-jre-headless, cloudstack-common (= ${source:Version}), lsb-base (>= 4.0), libcommons-daemon-java, openssh-client, qemu-kvm (>= 1.0), libvirt-bin (>= 0.9.8), uuid-runtime, iproute, ebtables, vlan, jsvc, ipset, python-libvirt, ethtool, iptables, lsb-release Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime, cloudstack-common (= ${source:Version}), lsb-base (>= 4.0), libcommons-daemon-java, openssh-client, qemu-kvm (>= 1.0), libvirt-bin (>= 0.9.8), uuid-runtime, iproute, ebtables, vlan, jsvc, ipset, python-libvirt, ethtool, iptables, lsb-release
Recommends: init-system-helpers Recommends: init-system-helpers
Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts
Description: CloudStack agent Description: CloudStack agent
@ -32,7 +32,7 @@ Description: CloudStack agent
Package: cloudstack-usage Package: cloudstack-usage
Architecture: all Architecture: all
Depends: openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-7-jre-headless, cloudstack-common (= ${source:Version}), jsvc, libmysql-java Depends: openjdk-8-jre-headless | java8-runtime-headless | java8-runtime, cloudstack-common (= ${source:Version}), jsvc, libmysql-java
Recommends: init-system-helpers Recommends: init-system-helpers
Description: CloudStack usage monitor Description: CloudStack usage monitor
The CloudStack usage monitor provides usage accounting across the entire cloud for The CloudStack usage monitor provides usage accounting across the entire cloud for

2
engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
View File

@ -65,7 +65,7 @@ public interface NetworkOrchestrationService {
static final String NetworkThrottlingRateCK = "network.throttling.rate"; static final String NetworkThrottlingRateCK = "network.throttling.rate";
static final String MinVRVersionCK = "minreq.sysvmtemplate.version"; static final String MinVRVersionCK = "minreq.sysvmtemplate.version";
static final ConfigKey<String> MinVRVersion = new ConfigKey<String>(String.class, MinVRVersionCK, "Advanced", "4.6.0", static final ConfigKey<String> MinVRVersion = new ConfigKey<String>(String.class, MinVRVersionCK, "Advanced", "4.10.0",
"What version should the Virtual Routers report", true, ConfigKey.Scope.Zone, null); "What version should the Virtual Routers report", true, ConfigKey.Scope.Zone, null);
static final ConfigKey<Integer> NetworkLockTimeout = new ConfigKey<Integer>(Integer.class, NetworkLockTimeoutCK, "Network", "600", static final ConfigKey<Integer> NetworkLockTimeout = new ConfigKey<Integer>(Integer.class, NetworkLockTimeoutCK, "Network", "600",

2
packaging/build-deb.sh
View File

@ -37,7 +37,7 @@ set -e
# docker run -ti -v /tmp:/src ubuntu:16.04 /bin/bash -c "apt-get update && apt-get install -y dpkg-dev python debhelper openjdk-8-jdk genisoimage python-mysql.connector maven lsb-release devscripts dh-systemd python-setuptools && /src/cloudstack/packaging/build-deb.sh" # docker run -ti -v /tmp:/src ubuntu:16.04 /bin/bash -c "apt-get update && apt-get install -y dpkg-dev python debhelper openjdk-8-jdk genisoimage python-mysql.connector maven lsb-release devscripts dh-systemd python-setuptools && /src/cloudstack/packaging/build-deb.sh"
# #
# Ubuntu 14.04 # Ubuntu 14.04
# docker run -ti -v /tmp:/src ubuntu:14.04 /bin/bash -c "apt-get update && apt-get install -y dpkg-dev python debhelper openjdk-7-jdk genisoimage python-mysql.connector maven lsb-release devscripts dh-systemd python-setuptools && /src/cloudstack/packaging/build-deb.sh" # docker run -ti -v /tmp:/src ubuntu:14.04 /bin/bash -c "apt-get update && apt-get install -y dpkg-dev python debhelper openjdk-8-jdk genisoimage python-mysql.connector maven lsb-release devscripts dh-systemd python-setuptools && /src/cloudstack/packaging/build-deb.sh"
# #
cd `dirname $0` cd `dirname $0`

2
packaging/centos63/cloud-agent.rc
View File

@ -49,7 +49,7 @@ unset OPTIONS
[ -r /etc/sysconfig/"$SHORTNAME" ] && source /etc/sysconfig/"$SHORTNAME" [ -r /etc/sysconfig/"$SHORTNAME" ] && source /etc/sysconfig/"$SHORTNAME"
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT) # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun" JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-1.8.0 /usr/lib/jvm/java-8-openjdk /usr/lib/jvm/java-8-openjdk-i386 /usr/lib/jvm/java-8-openjdk-amd64"
for jdir in $JDK_DIRS; do for jdir in $JDK_DIRS; do
if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then

8
packaging/centos63/cloud.spec
View File

@ -43,7 +43,7 @@ Group: System Environment/Libraries
Source0: %{name}-%{_maventag}.tgz Source0: %{name}-%{_maventag}.tgz
BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build
BuildRequires: java-1.7.0-openjdk-devel BuildRequires: java-1.8.0-openjdk-devel
BuildRequires: tomcat6 BuildRequires: tomcat6
BuildRequires: ws-commons-util BuildRequires: ws-commons-util
BuildRequires: jpackage-utils BuildRequires: jpackage-utils
@ -60,7 +60,7 @@ intelligent IaaS cloud implementation.
%package management %package management
Summary: CloudStack management server UI Summary: CloudStack management server UI
Requires: tomcat6 Requires: tomcat6
Requires: java-1.7.0-openjdk Requires: java-1.8.0-openjdk
Requires: python Requires: python
Requires: bash Requires: bash
Requires: bzip2 Requires: bzip2
@ -113,7 +113,7 @@ The Apache CloudStack files shared between agent and management server
%package agent %package agent
Summary: CloudStack Agent for KVM hypervisors Summary: CloudStack Agent for KVM hypervisors
Requires: openssh-clients Requires: openssh-clients
Requires: java-1.7.0-openjdk Requires: java-1.8.0-openjdk
Requires: %{name}-common = %{_ver} Requires: %{name}-common = %{_ver}
Requires: libvirt Requires: libvirt
Requires: bridge-utils Requires: bridge-utils
@ -152,7 +152,7 @@ The CloudStack baremetal agent
%package usage %package usage
Summary: CloudStack Usage calculation server Summary: CloudStack Usage calculation server
Requires: java-1.7.0-openjdk Requires: java-1.8.0-openjdk
Requires: jsvc Requires: jsvc
Requires: jakarta-commons-daemon Requires: jakarta-commons-daemon
Requires: jakarta-commons-daemon-jsvc Requires: jakarta-commons-daemon-jsvc

2
packaging/centos7/cloud-agent.rc
View File

@ -49,7 +49,7 @@ unset OPTIONS
[ -r /etc/sysconfig/"$SHORTNAME" ] && source /etc/sysconfig/"$SHORTNAME" [ -r /etc/sysconfig/"$SHORTNAME" ] && source /etc/sysconfig/"$SHORTNAME"
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT) # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun" JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-1.8.0-openjdk /usr/lib/jvm/java-8-openjdk-i386 /usr/lib/jvm/java-8-openjdk-amd64"
for jdir in $JDK_DIRS; do for jdir in $JDK_DIRS; do
if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then

8
packaging/centos7/cloud.spec
View File

@ -43,7 +43,7 @@ Group: System Environment/Libraries
Source0: %{name}-%{_maventag}.tgz Source0: %{name}-%{_maventag}.tgz
BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build
BuildRequires: java-1.7.0-openjdk-devel BuildRequires: java-1.8.0-openjdk-devel
BuildRequires: tomcat => 7.0 BuildRequires: tomcat => 7.0
BuildRequires: ws-commons-util BuildRequires: ws-commons-util
BuildRequires: jpackage-utils BuildRequires: jpackage-utils
@ -60,7 +60,7 @@ intelligent IaaS cloud implementation.
%package management %package management
Summary: CloudStack management server UI Summary: CloudStack management server UI
Requires: tomcat => 7.0 Requires: tomcat => 7.0
Requires: java => 1.7.0 Requires: java => 1.8.0
Requires: python Requires: python
Requires: bash Requires: bash
Requires: bzip2 Requires: bzip2
@ -99,7 +99,7 @@ The Apache CloudStack files shared between agent and management server
%package agent %package agent
Summary: CloudStack Agent for KVM hypervisors Summary: CloudStack Agent for KVM hypervisors
Requires: openssh-clients Requires: openssh-clients
Requires: java => 1.7.0 Requires: java => 1.8.0
Requires: %{name}-common = %{_ver} Requires: %{name}-common = %{_ver}
Requires: libvirt Requires: libvirt
Requires: bridge-utils Requires: bridge-utils
@ -131,7 +131,7 @@ The CloudStack baremetal agent
%package usage %package usage
Summary: CloudStack Usage calculation server Summary: CloudStack Usage calculation server
Requires: java => 1.7.0 Requires: java => 1.8.0
Requires: mysql-connector-java Requires: mysql-connector-java
Group: System Environment/Libraries Group: System Environment/Libraries
%description usage %description usage

2
packaging/debian/cloudstack-agent.init
View File

@ -50,7 +50,7 @@ unset OPTIONS
mkdir -m 0755 -p "$TMP" mkdir -m 0755 -p "$TMP"
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT) # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
JDK_DIRS="/usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-7-oracle /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun" JDK_DIRS="/usr/lib/jvm/java-8-openjdk-amd64 /usr/lib/jvm/java-8-openjdk-i386 /usr/lib/jvm/java-8-oracle"
for jdir in $JDK_DIRS; do for jdir in $JDK_DIRS; do
if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then

2
packaging/debian/cloudstack-usage.init
View File

@ -64,7 +64,7 @@ setJavaHome() {
# If everything has failed, try hardcoded paths # If everything has failed, try hardcoded paths
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT) # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
JDK_DIRS="/usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-7-oracle /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-sun" JDK_DIRS="/usr/lib/jvm/java-8-openjdk-amd64 /usr/lib/jvm/java-8-openjdk-i386 /usr/lib/jvm/java-8-oracle /usr/lib/jvm/java-8-openjdk"
for jdir in $JDK_DIRS; do for jdir in $JDK_DIRS; do
if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
JAVA_HOME="$jdir" JAVA_HOME="$jdir"

2
packaging/debian/init/cloud-management
View File

@ -65,7 +65,7 @@ TOMCAT6_USER=tomcat6
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
# defined in $DEFAULT) # defined in $DEFAULT)
JDK_DIRS="/usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-7-oracle /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-sun" JDK_DIRS="/usr/lib/jvm/java-8-openjdk-amd64 /usr/lib/jvm/java-8-openjdk-i386 /usr/lib/jvm/java-8-oracle /usr/lib/jvm/java-8-openjdk"
# Look for the right JVM to use # Look for the right JVM to use
for jdir in $JDK_DIRS; do for jdir in $JDK_DIRS; do

6
plugins/network-elements/f5/pom.xml
View File

@ -27,10 +27,14 @@
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis-jaxrpc</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.cloud.com.f5</groupId> <groupId>com.cloud.com.f5</groupId>
<artifactId>icontrol</artifactId> <artifactId>icontrol</artifactId>
<version>1.0</version> <version>12.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.axis</groupId> <groupId>org.apache.axis</groupId>

2
pom.xml
View File

@ -45,7 +45,7 @@
</issueManagement> </issueManagement>
<properties> <properties>
<cs.jdk.version>1.7</cs.jdk.version> <cs.jdk.version>1.8</cs.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

8
tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
View File

@ -20,6 +20,8 @@ set -e
set -x set -x
function add_backports() { function add_backports() {
sed -i '/cdrom/d' /etc/apt/sources.list
sed -i '/deb-src/d' /etc/apt/sources.list
sed -i '/backports/d' /etc/apt/sources.list sed -i '/backports/d' /etc/apt/sources.list
echo 'deb http://http.debian.net/debian wheezy-backports main' >> /etc/apt/sources.list echo 'deb http://http.debian.net/debian wheezy-backports main' >> /etc/apt/sources.list
} }
@ -30,9 +32,13 @@ function apt_upgrade() {
add_backports add_backports
apt-get clean rm -fv /root/*.iso
apt-get -y autoremove
apt-get autoclean
apt-get -q -y --force-yes update apt-get -q -y --force-yes update
apt-get -q -y --force-yes upgrade apt-get -q -y --force-yes upgrade
df -h
} }
return 2>/dev/null || apt_upgrade return 2>/dev/null || apt_upgrade

4
tools/appliance/definitions/systemvmtemplate/definition.rb
View File

@ -42,7 +42,7 @@ architectures = {
config = { config = {
:cpu_count => '1', :cpu_count => '1',
:memory_size => '256', :memory_size => '256',
:disk_size => '3000', :disk_format => 'VDI', :hostiocache => 'off', :disk_size => '3200', :disk_format => 'VDI', :hostiocache => 'off',
:iso_download_timeout => '1200', :iso_download_timeout => '1200',
:boot_wait => '10', :boot_wait => '10',
:boot_cmd_sequence => [ :boot_cmd_sequence => [
@ -71,7 +71,7 @@ config = {
:ssh_key => '', :ssh_key => '',
:ssh_host_port => '7222', :ssh_host_port => '7222',
:ssh_guest_port => '22', :ssh_guest_port => '22',
:sudo_cmd => "echo '%p'|sudo -S sh '%f'", :sudo_cmd => "echo '%p'|sudo -S bash '%f'",
:shutdown_cmd => 'halt -p', :shutdown_cmd => 'halt -p',
:postinstall_files => [ :postinstall_files => [
# basic minimal vm creation # basic minimal vm creation

19
tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
View File

@ -32,11 +32,12 @@ function debconf_packages() {
echo "openswan openswan/install_x509_certificate seen true" | debconf-set-selections echo "openswan openswan/install_x509_certificate seen true" | debconf-set-selections
echo "iptables-persistent iptables-persistent/autosave_v4 boolean true" | debconf-set-selections echo "iptables-persistent iptables-persistent/autosave_v4 boolean true" | debconf-set-selections
echo "iptables-persistent iptables-persistent/autosave_v6 boolean true" | debconf-set-selections echo "iptables-persistent iptables-persistent/autosave_v6 boolean true" | debconf-set-selections
echo "libc6 libraries/restart-without-asking boolean false" | debconf-set-selections
} }
function install_packages() { function install_packages() {
DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
DEBIAN_PRIORITY=critical export DEBIAN_PRIORITY=critical
local arch=`dpkg --print-architecture` local arch=`dpkg --print-architecture`
debconf_packages debconf_packages
@ -67,7 +68,6 @@ function install_packages() {
xenstore-utils libxenstore3.0 \ xenstore-utils libxenstore3.0 \
conntrackd ipvsadm libnetfilter-conntrack3 libnl-3-200 libnl-genl-3-200 \ conntrackd ipvsadm libnetfilter-conntrack3 libnl-3-200 libnl-genl-3-200 \
ipcalc \ ipcalc \
openjdk-7-jre-headless \
iptables-persistent \ iptables-persistent \
libtcnative-1 libssl-dev libapr1-dev \ libtcnative-1 libssl-dev libapr1-dev \
python-flask \ python-flask \
@ -89,10 +89,21 @@ function install_packages() {
dpkg -i hv-kvp-daemon_3.1_amd64.deb dpkg -i hv-kvp-daemon_3.1_amd64.deb
rm -f hv-kvp-daemon_3.1_amd64.deb rm -f hv-kvp-daemon_3.1_amd64.deb
# XS tools # XS tools
wget https://raw.githubusercontent.com/bhaisaab/cloudstack-nonoss/master/xe-guest-utilities_6.5.0_amd64.deb wget --no-check-certificate https://raw.githubusercontent.com/rhtyd/cloudstack-nonoss/master/xe-guest-utilities_6.5.0_amd64.deb
md5sum xe-guest-utilities_6.5.0_amd64.deb
dpkg -i xe-guest-utilities_6.5.0_amd64.deb dpkg -i xe-guest-utilities_6.5.0_amd64.deb
rm -f xe-guest-utilities_6.5.0_amd64.deb rm -f xe-guest-utilities_6.5.0_amd64.deb
fi fi
# Install OpenJDK8 pkgs maintained by Azul
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9
echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list
apt-get -y autoremove
apt-get autoclean
apt-get clean
apt-get update
${apt_get} install zulu-8
java -version
} }
return 2>/dev/null || install_packages return 2>/dev/null || install_packages

4
tools/appliance/definitions/systemvmtemplate/preseed.cfg
View File

@ -60,7 +60,7 @@ d-i partman-auto/expert_recipe string \
use_filesystem{ } filesystem{ ext4 } \ use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /home } \ mountpoint{ /home } \
. \ . \
800 60 1400 ext4 \ 1000 60 1400 ext4 \
method{ format } format{ } \ method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \ use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /usr } \ mountpoint{ /usr } \
@ -75,7 +75,7 @@ d-i partman-auto/expert_recipe string \
use_filesystem{ } filesystem{ ext4 } \ use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var } \ mountpoint{ /var } \
. \ . \
200 50 500 ext4 \ 400 50 500 ext4 \
method{ format } format{ } \ method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \ use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var/log } \ mountpoint{ /var/log } \

4
tools/docker/Dockerfile
View File

@ -22,13 +22,13 @@ FROM ubuntu:14.04
MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org> MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.10.0.0-SNAPSHOT" LABEL Vendor="Apache.org" License="ApacheV2" Version="4.10.0.0-SNAPSHOT"
RUN apt-get -y update && apt-get install -y \ RUN add-apt-repository -y ppa:openjdk-r/ppa && apt-get -y update && apt-get install -y \
genisoimage \ genisoimage \
libffi-dev \ libffi-dev \
libssl-dev \ libssl-dev \
git \ git \
maven \ maven \
openjdk-7-jdk \ openjdk-8-jdk \
python-dev \ python-dev \
python-setuptools \ python-setuptools \
python-pip \ python-pip \