File tree Expand file tree Collapse file tree 3 files changed +10
-10
lines changed
Expand file tree Collapse file tree 3 files changed +10
-10
lines changed Original file line number Diff line number Diff line change 1- FROM ubuntu:xenial-20180808
1+ FROM ubuntu:xenial-20181113
22
33MAINTAINER "René Moser" <
[email protected] >
44
5- ARG src_url=https://github.com/apache/cloudstack/archive/4.11.1 .0.tar.gz
5+ ARG src_url=https://github.com/apache/cloudstack/archive/4.11.2 .0.tar.gz
66
77RUN echo 'mysql-server mysql-server/root_password password root' | debconf-set-selections; \
88 echo 'mysql-server mysql-server/root_password_again password root' | debconf-set-selections;
@@ -59,7 +59,7 @@ RUN (/usr/bin/mysqld_safe &); \
5959
6060COPY zones.cfg /opt/zones.cfg
6161COPY nginx_default.conf /etc/nginx/sites-available/default
62- RUN pip install cs==2.3.1
62+ RUN pip install cs==2.5
6363COPY run.sh /opt/run.sh
6464COPY deploy.sh /opt/deploy.sh
6565COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
Original file line number Diff line number Diff line change @@ -12,12 +12,12 @@ sleep 3
1212python /opt/cloudstack/tools/marvin/marvin/deployDataCenter.py -i /opt/zones.cfg
1313
1414export CLOUDSTACK_ENDPOINT=http://127.0.0.1:8096
15- export CLOUDSTACK_KEY=" "
16- export CLOUDSTACK_SECRET=" "
15+ export CLOUDSTACK_KEY=dummy
16+ export CLOUDSTACK_SECRET=dummy
1717
1818# Add Simulator to supported hypervisors exclusively
1919cs updateConfiguration name=hypervisor.list value=Simulator
2020
2121# Workaround for Nuage VPC Offering
22- vpc_offering_id=" $( cs listVPCOfferings listall=true name=Nuage | jq .vpcoffering[0].id) "
22+ vpc_offering_id=" $( cs listVPCOfferings name=Nuage | jq ' .vpcoffering[0].id' ) "
2323cs updateVPCOffering id=$vpc_offering_id state=Disabled
Original file line number Diff line number Diff line change 1111sleep 3
1212
1313export CLOUDSTACK_ENDPOINT=http://127.0.0.1:8096
14- export CLOUDSTACK_KEY=" "
15- export CLOUDSTACK_SECRET=" "
14+ export CLOUDSTACK_KEY=dummy
15+ export CLOUDSTACK_SECRET=dummy
1616
17- admin_id=" $( cs listUsers account=admin | jq .user[0].id) "
18- cs getUserKeys id=$admin_id | jq .userkeys > /var/www/html/admin.json
17+ admin_id=" $( cs listUsers account=admin | jq ' .user[0].id' ) "
18+ cs getUserKeys id=$admin_id | jq ' .userkeys' > /var/www/html/admin.json
You can’t perform that action at this time.
0 commit comments