From d20042e955675db2010c107692a14a2e18111c15 Mon Sep 17 00:00:00 2001
From: Konrad Kleine <konrad.wilhelm.kleine@gmail.com>
Date: Mon, 31 Aug 2015 10:55:14 +0200
Subject: [PATCH] Revert "Add apiVersion flag and
 ENV_DOCKER_REGISTRY_API_VERSION var"

This reverts commit 2fe27a2902c65928006f07f1b3b6f7ac23862999.
---
 app/registry-host.json                    | 1 -
 app/scripts/services/registry-services.js | 2 --
 start-apache.sh                           | 5 +----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/registry-host.json b/app/registry-host.json
index 006c639..c63adaf 100644
--- a/app/registry-host.json
+++ b/app/registry-host.json
@@ -1,5 +1,4 @@
 {
   "host": "path-to-your-registry",
   "port": 80
-  "apiVersion": "v1"
 }
diff --git a/app/scripts/services/registry-services.js b/app/scripts/services/registry-services.js
index 7b5e696..298d04d 100644
--- a/app/scripts/services/registry-services.js
+++ b/app/scripts/services/registry-services.js
@@ -17,8 +17,6 @@ angular.module('registry-services', ['ngResource'])
     });
   }])
   .factory('Repository', ['$resource', '$log',  function($resource, $log){
-    console.log("API VERSION IS:");
-    console.log(RegistryHost());
     return $resource('/v1/search?q=:searchTerm', {}, {
       'query': {
         method:'GET',
diff --git a/start-apache.sh b/start-apache.sh
index 6db8c85..756dfc2 100644
--- a/start-apache.sh
+++ b/start-apache.sh
@@ -31,12 +31,9 @@ else
   echo "export DOCKER_REGISTRY_SCHEME=http" >> /etc/apache2/envvars
 fi
 
-# Allow either v1 or v2 Docker Registry API version (defaults to "v1")
-[[ x$ENV_DOCKER_REGISTRY_API_VERSION =~ ^xv(1|2)$ ]] || ENV_DOCKER_REGISTRY_API_VERSION="v1"
-
 # docker-registry-frontend acts as a proxy so may well
 # have a different hostname than the registry itself.
-echo "{\"host\": \"$ENV_REGISTRY_PROXY_FQDN\", \"port\": $ENV_REGISTRY_PROXY_PORT, \"apiVersion\": \"$ENV_DOCKER_REGISTRY_API_VERSION\"}" > /var/www/html/registry-host.json
+echo "{\"host\": \"$ENV_REGISTRY_PROXY_FQDN\", \"port\": $ENV_REGISTRY_PROXY_PORT}" > /var/www/html/registry-host.json
 
 # information about browse mode.
 [[ x$ENV_MODE_BROWSE_ONLY =~ ^x(true|false)$ ]] || ENV_MODE_BROWSE_ONLY=false