Merge remote-tracking branch 'origin/master' into v2

* origin/master:
  Add imagelayers.io label
  Revert "Attempt to fix kwk#53"
  Simplified develop instructions
  Update README.md
  Fix problem with SSL CA when setting up development containers

# Conflicts:
#	develop/Dockerfile

README.md

@@ -18,6 +18,8 @@ The `docker-registry-frontend` is a browser-based solution for browsing and modi
 
 ***TO PULL A VERSION OF THIS BRANCH FROM THE DOCKER HUB, MAKE SURE YOU PULL AND RUN ```konradkleine/docker-registry-frontend:v2```***
 
+[![](https://badge.imagelayers.io/konradkleine/docker-registry-frontend:master.svg)](https://imagelayers.io/?images=konradkleine/docker-registry-frontend:master 'Get your own badge on imagelayers.io')
+
 # Features
 
 For a list of all the features, please see the [Wiki][features]. Note, that currently the Wiki pages still refer to version 1 of this frontend.

develop/README.md

@@ -1,6 +1,6 @@
 # Setup development environment
 
-These sections show how you can get started to develop for the docker-registry-frontend on various platforms.
+These sections show how you can get started to develop for the docker-registry-frontend.
 
 ## Quick and dirty frontend development
 
@@ -25,7 +25,7 @@ If you want to use your own hosted registry with your development environment, m
 
 Kill all potentially running frontend or registry containers:
 
-    docker-compose -f docker-registry-frontend/develop/docker-compose.yml kill
+    cd docker-registry-frontend/develop && docker-compose kill
 
 Then open [develop/docker-compose.yml](docker-compose.yml) and paste this into the file:
 
@@ -60,7 +60,7 @@ Adjust them to your liking and replace `path-to-your-registry` with the IP addre
 
 Now, setup your containers again:
 
-   `docker-compose -f docker-registry-frontend/develop/docker-compose.yml up -d`
+   `cd docker-registry-frontend/develop && docker-compose up`
 
 Finally, browse to [http://localhost:9000](http://localhost:9000) to see the frontend serving your registry.