Merge branch 'initial_fix' of krzysiej/docker_flask into master

README.md

@@ -2,14 +2,7 @@
 
 
 ## Run
-    pip install -r requirements.txt
-    set FLASK_APP=index.py
+	`set FLASK_APP=index.py
     set FLASK_DEBUG=1
-    flask run -p 5001
-	
-or
-    pip install -r requirements.txt
-    python index.py
-
-
-	
+	set 
+    flask run -p 5001`

index.py

@@ -68,8 +68,7 @@ def images_all_action(client_name):
 def image_action(client_name, image_id):
     if client_name in clients:
         image = clients[client_name].images.get(image_id)
-        return render_template('image.html', image=image, image_attributes=json.dumps(image.attrs, indent=4),
-                               client_name=client_name)
+        return render_template('image.html', image=image, client_name=client_name)
     else:
         flash('Client name \'%s\' not found' % client_name)
         return redirect(url_for('index'))

requirements.txt

@@ -1,17 +0,0 @@
-certifi==2018.1.18
-chardet==3.0.4
-click==6.7
-docker==3.1.4
-docker-pycreds==0.2.2
-Flask==0.12.2
-idna==2.6
-itsdangerous==0.24
-Jinja2==2.10
-MarkupSafe==1.0
-pypiwin32==219
-requests==2.18.4
-six==1.11.0
-Unidecode==1.0.22
-urllib3==1.22
-websocket-client==0.47.0
-Werkzeug==0.14.1

static/style.css

@@ -62,9 +62,9 @@ min-width: 140px;
 table tbody tr:nth-child(2n+1) {
 background-color: #f9f9f9; }
 
-h1 { font-size: 2.75em; margin: 16px 32px 16px 0;}
-h2 { font-size: 2em; margin: 16px 32px 16px 0;}
-h3 { font-size: 1.5em; margin: 16px 32px 16px 0;}
+h1 { font-size: 2.75em; margin: 16px 32px 16px 32px;}
+h2 { font-size: 2em; margin: 16px 32px 16px 16px;}
+h3 { font-size: 1.5em; margin: 16px 32px 16px 32px;}
 
 a {color: dodgerblue; text-decoration: none; }
 a:hover { text-decoration: underline; }
@@ -118,10 +118,10 @@ list-style-position: inside;
 margin: 8px 8px;
 }
 
-.container_attribute, .image_attribute {
+.container_attribute {
 
 }
-.container_attribute-details, .image_attribute-details {
+.container_attribute-details {
     white-space: pre;
     line-height: 1.1em;
 }

templates/containers.html

@@ -2,7 +2,7 @@
 {% block body %}
 
 
-<h1><a href="/">Dashboard</a> &raquo; {{ client_name }} &raquo;  <a href="/{{ client_name }}/containers">Containers</a></h1>
+<h1><a href="/">Dashboard</a> &raquo; {{ client_name }} &raquo; Containers</h1>
 
 
 <a class="button--link" href="/{{ client_name }}/containers/all">All Containers</a>

templates/image.html

@@ -6,7 +6,7 @@
     }} {% endif %}</h1>
 
 <h2>Details</h2>
-<div class="image_attribute">
-    <div class="image_attribute-details">{{ image_attributes }}</div>
-</div>
+<pre>
+    {{ image.attrs | pprint }}
+</pre>
 {% endblock %}

templates/images.html

@@ -2,7 +2,7 @@
 {% block body %}
 
 
-<h1><a href="/">Dashboard</a> &raquo; {{ client_name }} &raquo; <a href="/{{ client_name }}/images">Images</a></h1>
+<h1><a href="/">Dashboard</a> &raquo; {{ client_name }} &raquo; Images</h1>
 
 
 <a class="button--link" href="/{{ client_name }}/images/dangling">Dangling Images</a>