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

Merge release branch 4.13 to master

Browse Source 
* 4.13:
  vr: fix password server run with empty gateway in isolated netw… (#3943)
  Fix simulator docker db deploy issue (apache#3397) (#3651)
This commit is contained in:
Daan Hoogland 2020-03-09 11:26:21 +01:00
commit 6f9890694d
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
systemvm/debian/opt/cloud/bin/cs/CsAddress.py
View File

@ -583,9 +583,9 @@ class CsIP:
CsPasswdSvc(self.address['public_ip']).stop() CsPasswdSvc(self.address['public_ip']).stop()
elif cmdline.is_master(): elif cmdline.is_master():
if method == "add": if method == "add":
CsPasswdSvc(self.address['gateway'] + "," + self.address['public_ip']).start() CsPasswdSvc(self.get_gateway() + "," + self.address['public_ip']).start()
elif method == "delete": elif method == "delete":
CsPasswdSvc(self.address['gateway'] + "," + self.address['public_ip']).stop() CsPasswdSvc(self.get_gateway() + "," + self.address['public_ip']).stop()
if self.get_type() == "public" and self.config.is_vpc() and method == "add": if self.get_type() == "public" and self.config.is_vpc() and method == "add":
if self.address["source_nat"]: if self.address["source_nat"]:

13
tools/docker/Dockerfile
View File

@ -22,6 +22,8 @@ FROM ubuntu:16.04
MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org> MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.14.0.0-SNAPSHOT" LABEL Vendor="Apache.org" License="ApacheV2" Version="4.14.0.0-SNAPSHOT"
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get -y update && apt-get install -y \ RUN apt-get -y update && apt-get install -y \
genisoimage \ genisoimage \
libffi-dev \ libffi-dev \
@ -37,18 +39,12 @@ RUN apt-get -y update && apt-get install -y \
python-mysql.connector \ python-mysql.connector \
supervisor supervisor
RUN echo 'mysql-server mysql-server/root_password password root' | debconf-set-selections; \
echo 'mysql-server mysql-server/root_password_again password root' | debconf-set-selections;
RUN apt-get install -qqy mysql-server && \ RUN apt-get install -qqy mysql-server && \
apt-get clean all && \ apt-get clean all && \
mkdir /var/run/mysqld; \ mkdir /var/run/mysqld; \
chown mysql /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 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
COPY tools/docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY tools/docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY . ./root COPY . ./root
@ -56,13 +52,16 @@ WORKDIR /root
RUN mvn -Pdeveloper -Dsimulator -DskipTests clean install RUN mvn -Pdeveloper -Dsimulator -DskipTests clean install
RUN (/usr/bin/mysqld_safe &); \ RUN find /var/lib/mysql -type f -exec touch {} \; && \
(/usr/bin/mysqld_safe &) && \
sleep 5; \ sleep 5; \
mvn -Pdeveloper -pl developer -Ddeploydb; \ mvn -Pdeveloper -pl developer -Ddeploydb; \
mvn -Pdeveloper -pl developer -Ddeploydb-simulator; \ mvn -Pdeveloper -pl developer -Ddeploydb-simulator; \
MARVIN_FILE=`find /root/tools/marvin/dist/ -name "Marvin*.tar.gz"`; \ MARVIN_FILE=`find /root/tools/marvin/dist/ -name "Marvin*.tar.gz"`; \
pip install $MARVIN_FILE pip install $MARVIN_FILE
VOLUME /var/lib/mysql
EXPOSE 8080 8096 EXPOSE 8080 8096
CMD ["/usr/bin/supervisord"] CMD ["/usr/bin/supervisord"]