merge with docker-registry