updated default username/password to be just "dockerjava" as hyphen i…

…s not allowed in usernames by Docker
docker-java · alexec · Nov 9, 2014 · Nov 2, 2014 · Nov 2, 2014 · Nov 2, 2014
commit 402fa2b1e3d146083ae71128d3209ab4a5a30bd2
diff --git a/docker-auth-registry/Dockerfile b/docker-auth-registry/Dockerfile
@@ -1,5 +1,3 @@
-# https://medium.com/@deeeet/building-private-docker-registry-with-basic-authentication-with-self-signed-certificate-using-it-e6329085e612
-
 FROM registry
 
 RUN apt-get update

diff --git a/docker-auth-registry/README.md b/docker-auth-registry/README.md
@@ -6,3 +6,5 @@ This creates a registry that runs locally with plain text authentication set-up.
 	./build.sh
 	./run.sh
 	./test.sh
+
+Based on <https://medium.com/@deeeet/building-private-docker-registry-with-basic-authentication-with-self-signed-certificate-using-it-e6329085e612>.
diff --git a/docker-auth-registry/docker-registry.htpasswd b/docker-auth-registry/docker-registry.htpasswd
@@ -1 +1 @@
-docker-java:$apr1$nhxYQXIn$s93lYeFNs66YAXwQerlHL0
+dockerjava:$apr1$9s.aEJml$nivZMa6GEWnJA/FhpTPbj0
diff --git a/docker-auth-registry/test.sh b/docker-auth-registry/test.sh
@@ -2,5 +2,5 @@
 set -eux
 
 curl http://localhost:5001/v1/_ping 
-curl http://localhost:5001/v1/users/ --basic --user docker-java:docker-java
+curl http://localhost:5001/v1/users/ --basic --user dockerjava:dockerjava
 
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -23,8 +23,9 @@ public abstract class AbstractDockerClientTest extends Assert {
 
 	public static final Logger LOG = LoggerFactory
 			.getLogger(AbstractDockerClientTest.class);
-
-	protected DockerClient dockerClient;
+    public static final String DOCKER_JAVA = "dockerjava";
+
+    protected DockerClient dockerClient;
 
 	protected TestDockerCmdExecFactory dockerCmdExecFactory = new TestDockerCmdExecFactory(DockerClientBuilder.getDefaultDockerCmdExecFactory());
 
@@ -46,15 +47,15 @@ public void beforeTest()  {
 	}
 
     private DockerClientConfig config() {
-        return config("docker-java");
+        return config(DOCKER_JAVA);
     }
 
     protected DockerClientConfig config(String password) {
         return DockerClientConfig.createDefaultConfigBuilder()
                 .withServerAddress("http://localhost:5001")
-                .withUsername("docker-java")
+                .withUsername(DOCKER_JAVA)
                 .withPassword(password)
-                .withEmail("docker-java@github.com")
+                .withEmail(DOCKER_JAVA + "@github.com")
                 .build();
     }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		docker-java:$apr1$nhxYQXIn$s93lYeFNs66YAXwQerlHL0
		dockerjava:$apr1$9s.aEJml$nivZMa6GEWnJA/FhpTPbj0