From 450d8d00fb5966c5cda8f2ed878f1b3add1adaf1 Mon Sep 17 00:00:00 2001 From: Pierre-Luc Dion Date: Mon, 30 Jan 2017 20:35:10 -0500 Subject: [PATCH] Upgrade base distro to Ubuntu 16.04, fix support for JDK8, fix dependencies, should fix current broken build of docker simulator --- tools/docker/Dockerfile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 9939a911b50c..f53febe317f7 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" 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