You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/01/31 06:53:05 UTC
[1/2] git commit: updated refs/heads/master to 17787a1
Repository: cloudstack
Updated Branches:
refs/heads/master 67f0254ac -> 17787a194
Upgrade base distro to Ubuntu 16.04, fix support for JDK8, fix dependencies, should fix current broken build of docker simulator
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/450d8d00
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/450d8d00
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/450d8d00
Branch: refs/heads/master
Commit: 450d8d00fb5966c5cda8f2ed878f1b3add1adaf1
Parents: f10c8bf
Author: Pierre-Luc Dion <pd...@apache.org>
Authored: Mon Jan 30 20:35:10 2017 -0500
Committer: Pierre-Luc Dion <pd...@apache.org>
Committed: Mon Jan 30 20:35:10 2017 -0500
----------------------------------------------------------------------
tools/docker/Dockerfile | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/450d8d00/tools/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 9939a91..f53febe 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,16 +17,18 @@
#
# CloudStack-simulator build
-FROM ubuntu:14.04
+FROM ubuntu:16.04
MAINTAINER "Apache CloudStack" <de...@cloudstack.apache.org>
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.10.0.0-SNAPSHOT"
-RUN add-apt-repository -y ppa:openjdk-r/ppa && apt-get -y update && apt-get install -y \
+RUN apt-get -y update && apt-get install -y \
genisoimage \
libffi-dev \
libssl-dev \
git \
+ sudo \
+ ipmitool \
maven \
openjdk-8-jdk \
python-dev \
@@ -39,8 +41,11 @@ RUN echo 'mysql-server mysql-server/root_password password root' | debconf-set-
echo 'mysql-server mysql-server/root_password_again password root' | debconf-set-selections;
RUN apt-get install -qqy mysql-server && \
- apt-get clean all
+ apt-get clean all && \
+ mkdir /var/run/mysqld; \
+ chown mysql /var/run/mysqld
+RUN echo '''sql_mode = "STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"''' >> /etc/mysql/mysql.conf.d/mysqld.cnf
RUN (/usr/bin/mysqld_safe &); sleep 5; mysqladmin -u root -proot password ''
#RUN pip install --allow-external mysql-connector-python mysql-connector-python
[2/2] git commit: updated refs/heads/master to 17787a1
Posted by ra...@apache.org.
Merge pull request #1921 from pdion891/dockerfile_ubuntu1604_jdk8
Dockerfile: Upgrade base distro to Ubuntu 16.04, fix support for JDK8Fix current broken build introduce with JDK upgrade from #1888 of docker simulator because of missing dependencies and JDK8. This PR upgrade the distro to Ubuntu 16.04 and use default jdk version 8.
I've quickly test the build locally, no error in the UI and logs.
* pr/1921:
Upgrade base distro to Ubuntu 16.04, fix support for JDK8, fix dependencies, should fix current broken build of docker simulator
Signed-off-by: Rajani Karuturi <ra...@accelerite.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/17787a19
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/17787a19
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/17787a19
Branch: refs/heads/master
Commit: 17787a194a54f218aacbd443909313041d7a69c3
Parents: 67f0254 450d8d0
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Tue Jan 31 12:22:41 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Tue Jan 31 12:22:42 2017 +0530
----------------------------------------------------------------------
tools/docker/Dockerfile | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------