Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use nginx image which supports bcrypt #4489

Merged
merged 4 commits into from
Sep 6, 2017
Merged

Use nginx image which supports bcrypt #4489

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d706665
Revert "nginx does not support bcrypt when using auth_basic (#4332)"
vidarl Sep 1, 2017
cfa49d6
Changed to nginx:alpine image which supports bcrypt
vidarl Sep 1, 2017
092ddd6
Fixed invalid volume definition
vidarl Sep 1, 2017
2d40553
Copyedits
Sep 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions registry/recipes/nginx.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add something about "If you want to drop use of bcrypt, you can change the htpasswd command to not include the -B argument".

# Ref. https://github.com/nginxinc/docker-nginx/issues/29
image: "nginx:alpine"
ports:
- 5043:443
links:
Expand All @@ -174,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
Expand Down