Revert "Add apiVersion flag and ENV_DOCKER_REGISTRY_API_VERSION var"

This reverts commit 2fe27a2902.
This commit is contained in:
Konrad Kleine 2015-08-31 10:55:14 +02:00
parent 5e15c62e80
commit d20042e955
3 changed files with 1 additions and 7 deletions

View file

@ -1,5 +1,4 @@
{
"host": "path-to-your-registry",
"port": 80
"apiVersion": "v1"
}

View file

@ -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',

View file

@ -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