Commit 7dd6488e authored by Daniele Venzano's avatar Daniele Venzano

Merge leftovers

parent 4d7a97a0
......@@ -143,29 +143,6 @@ zoe:
only:
- master
#angular_frontend:
# stage: deploy
# image: node:latest
# before_script:
# - which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )
# - eval $(ssh-agent -s)
# - ssh-add <(echo "$SSH_PRIVATE_KEY")
# - mkdir -p ~/.ssh
# - 'echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
# - apt-get update -y && apt-get install rsync -y
# script:
# - cd zoe_fe
# - npm install
# - npm install -g --save-dev @angular/cli
# - 'sed -i -e "s/cors: false,/cors: true,/" src/environments/environment.prod.ts'
# - 'sed -i -e "s/apiEndpoint: .*,/apiEndpoint: ''http:\/\/192.168.45.189:5001\/api\/0.7'',/" src/environments/environment.prod.ts'
# - ng build --env=prod --output-path=build/prod --base-href /angular
# - rsync -avz build/prod/ ubuntu@${STAGING_IP}:${WEB_STAGING_PATH}/angular
# environment:
# name: staging
# only:
# - master
cleaup-images:
image: docker:latest
stage: cleanup
......
......@@ -43,22 +43,15 @@
<li class="container_name" id="{{ s['id'] }}">{{ s['name'] }}</li>
<ul>
<li>Zoe status: {{ s['status'] }}</li>
<li>Docker status: {{ s['docker_status'] }}</li>
<li>Docker status: {{ s['backend_status'] }}</li>
{% if s['error_message'] is not none %}
<li>Error: {{ s['error_message'] }}</li>
{% endif %}
<<<<<<< HEAD
=======
{% if s['backend_status'] == 'started' %}
{% for p in s['description']['ports'] %}
{% if s['proxy_address'] is not none %}
<li><a href="http://{{ s['proxy_address'] }}">{{ p['name'] }}</a></li>
{% else %}
<li><a> {{ p['name'] }} IP: {{ s['ip_address'] }}</a></li>
{% endif %}
<li><a> {{ p['name'] }} IP: {{ s['ip_address'] }}</a></li>
{% endfor %}
{% endif %}
>>>>>>> ext/devel/master
</ul>
{% endfor %}
</ul>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment