Adding default configs to build from git repo

Images will be built with sources from master branch of
https://github.com/openstack/horizon.git repository by default.

Change-Id: I68c2c3b3b23ecbb5015b53593cc9a3796e4429a5
Depends-On: I4d91aa8632fcd55735d791300fde475696b435b5
This commit is contained in:
Andrey 2016-08-24 08:15:14 +00:00 committed by Andrey Pavlov
parent d46fb06d4d
commit fa94640e15
2 changed files with 13 additions and 10 deletions

View File

@ -7,18 +7,16 @@ RUN apt-get update \
libapache2-mod-wsgi \
&& ln -s ../mods-available/headers.load /etc/apache2/mods-enabled/headers.load
RUN curl -o horizon-{{ branch }}.tar.gz http://tarballs.openstack.org/horizon/horizon-{{ branch }}.tar.gz \
&& tar -zxvf horizon-{{ branch }}.tar.gz
{{ copy_sources("openstack/horizon", "/horizon") }}
RUN mv horizon*/ horizon-{{ branch }}/ \
&& mkdir -p /etc/openstack-dashboard /home/horizon /var/www/cgi-bin/horizon \
&& /var/lib/microservices/venv/bin/pip --no-cache-dir install --upgrade -c /horizon-{{ branch }}/requirements.txt /horizon-{{ branch }} \
RUN mkdir -p /etc/openstack-dashboard /home/horizon /var/www/cgi-bin/horizon \
&& /var/lib/microservices/venv/bin/pip --no-cache-dir install --upgrade -c /horizon/requirements.txt /horizon \
&& useradd --user-group horizon \
&& ln -s /etc/openstack-dashboard/local_settings /var/lib/microservices/venv/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py \
&& cp -r /horizon-{{ branch }}/openstack_dashboard/conf/* /etc/openstack-dashboard/ \
&& cp /horizon-{{ branch }}/manage.py /var/lib/microservices/venv/bin/manage.py \
&& cp -r /horizon/openstack_dashboard/conf/* /etc/openstack-dashboard/ \
&& cp /horizon/manage.py /var/lib/microservices/venv/bin/manage.py \
&& /var/lib/microservices/venv/bin/python /var/lib/microservices/venv/bin/manage.py collectstatic --noinput --clear \
&& chown -R horizon: /etc/openstack-dashboard /home/horizon /var/lib/microservices/venv/lib/python2.7/site-packages/static /horizon-{{ branch }}
&& chown -R horizon: /etc/openstack-dashboard /home/horizon /var/lib/microservices/venv/lib/python2.7/site-packages/static /horizon
ENV PATH /var/lib/venv/bin:$PATH

View File

@ -1,3 +1,8 @@
configs:
horizon_port: 80
horizon_secret_key: secret
horizon_port: 80
horizon_secret_key: secret
sources:
openstack/horizon:
git_url: https://github.com/openstack/horizon.git
git_ref: master