From d7066659e30c6f1f2e0dc61458f3bfa16da3515e Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Fri, 1 Sep 2017 14:34:10 +0200 Subject: [PATCH 1/4] Revert "nginx does not support bcrypt when using auth_basic (#4332)" This reverts commit 9ccf803424b1734622c0f448888b07d2119f08b5. --- registry/recipes/nginx.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/registry/recipes/nginx.md b/registry/recipes/nginx.md index 94565b83325..57f2a072603 100644 --- a/registry/recipes/nginx.md +++ b/registry/recipes/nginx.md @@ -146,7 +146,7 @@ Review the [requirements](/registry/recipes/index.md#requirements), then follow 3. Create a password file `auth/nginx.htpasswd` for "testuser" and "testpassword". ```bash - $ docker run --rm --entrypoint htpasswd registry:2 -bn testuser testpassword > auth/nginx.htpasswd + $ docker run --rm --entrypoint htpasswd registry:2 -Bbn testuser testpassword > auth/nginx.htpasswd ``` 4. Copy your certificate files to the `auth/` directory. From cfa49d62c34d38c4f1e85c61c151f5aa9e470614 Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Fri, 1 Sep 2017 14:38:04 +0200 Subject: [PATCH 2/4] Changed to nginx:alpine image which supports bcrypt --- registry/recipes/nginx.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/registry/recipes/nginx.md b/registry/recipes/nginx.md index 57f2a072603..fd53c5fef3a 100644 --- a/registry/recipes/nginx.md +++ b/registry/recipes/nginx.md @@ -160,7 +160,9 @@ Review the [requirements](/registry/recipes/index.md#requirements), then follow ```yaml nginx: - image: "nginx:1.9" + # Note : Only the alpine flavour supports bcrypt + # Ref. https://github.com/nginxinc/docker-nginx/issues/29 + image: "nginx:alpine" ports: - 5043:443 links: From 092ddd674cd8c8bcbfe1553cf2fd58f93549b106 Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Fri, 1 Sep 2017 14:41:46 +0200 Subject: [PATCH 3/4] Fixed invalid volume definition --- registry/recipes/nginx.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/registry/recipes/nginx.md b/registry/recipes/nginx.md index fd53c5fef3a..37dfb24df2d 100644 --- a/registry/recipes/nginx.md +++ b/registry/recipes/nginx.md @@ -176,7 +176,7 @@ Review the [requirements](/registry/recipes/index.md#requirements), then follow ports: - 127.0.0.1:5000:5000 volumes: - - `pwd`./data:/var/lib/registry + - ./data:/var/lib/registry ``` ## Starting and stopping From 2d405532f26eef060f4aa9aec5026c10c61fa5d6 Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Wed, 6 Sep 2017 13:27:33 -0700 Subject: [PATCH 4/4] Copyedits --- registry/recipes/nginx.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/registry/recipes/nginx.md b/registry/recipes/nginx.md index 37dfb24df2d..a8dbce4e707 100644 --- a/registry/recipes/nginx.md +++ b/registry/recipes/nginx.md @@ -148,6 +148,8 @@ Review the [requirements](/registry/recipes/index.md#requirements), then follow ```bash $ docker run --rm --entrypoint htpasswd registry:2 -Bbn testuser testpassword > auth/nginx.htpasswd ``` + + > **Note**: If you do not want to use `bcrypt`, you can omit the `-B` parameter. 4. Copy your certificate files to the `auth/` directory. @@ -160,7 +162,8 @@ Review the [requirements](/registry/recipes/index.md#requirements), then follow ```yaml nginx: - # Note : Only the alpine flavour supports bcrypt + # Note : Only nginx:alpine supports bcrypt. + # If you don't need to use bcrypt, you can use a different tag. # Ref. https://github.com/nginxinc/docker-nginx/issues/29 image: "nginx:alpine" ports: