mirror of
https://github.com/distribution/distribution
synced 2024-11-06 19:35:52 +01:00
Carry #1329 : Fixes so that nginx will start
Signed-off-by: Richard Scothern <richard.scothern@gmail.com> Signed-off-by: Sean Boran <Boran@users.noreply.github.com>
This commit is contained in:
parent
7378e21678
commit
07e68b3b04
@ -71,21 +71,27 @@ Create the main nginx configuration you will use.
|
||||
```
|
||||
|
||||
cat <<EOF > auth/nginx.conf
|
||||
upstream docker-registry {
|
||||
server registry:5000;
|
||||
events {
|
||||
worker_connections 1024;
|
||||
}
|
||||
|
||||
## Set a variable to help us decide if we need to add the
|
||||
## 'Docker-Distribution-Api-Version' header.
|
||||
## The registry always sets this header.
|
||||
## In the case of nginx performing auth, the header will be unset
|
||||
## since nginx is auth-ing before proxying.
|
||||
map \$upstream_http_docker_distribution_api_version \$docker_distribution_api_version {
|
||||
http {
|
||||
|
||||
upstream docker-registry {
|
||||
server registry:5000;
|
||||
}
|
||||
|
||||
## Set a variable to help us decide if we need to add the
|
||||
## 'Docker-Distribution-Api-Version' header.
|
||||
## The registry always sets this header.
|
||||
## In the case of nginx performing auth, the header will be unset
|
||||
## since nginx is auth-ing before proxying.
|
||||
map \$upstream_http_docker_distribution_api_version \$docker_distribution_api_version {
|
||||
'registry/2.0' '';
|
||||
default registry/2.0;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
server {
|
||||
listen 443 ssl;
|
||||
server_name myregistrydomain.com;
|
||||
|
||||
@ -127,14 +133,15 @@ server {
|
||||
proxy_set_header X-Forwarded-Proto \$scheme;
|
||||
proxy_read_timeout 900;
|
||||
}
|
||||
}
|
||||
}
|
||||
EOF
|
||||
```
|
||||
|
||||
Now, create a password file for "testuser" and "testpassword"
|
||||
Now create a password file for "testuser" and "testpassword"
|
||||
|
||||
```
|
||||
docker run --entrypoint htpasswd httpd:2.4 -bn testuser testpassword > auth/nginx.htpasswd
|
||||
docker run --rm --entrypoint htpasswd registry:2 -bn testuser testpassword > auth/nginx.htpasswd
|
||||
```
|
||||
|
||||
Copy over your certificate files
|
||||
@ -155,14 +162,15 @@ nginx:
|
||||
links:
|
||||
- registry:registry
|
||||
volumes:
|
||||
- `pwd`/auth/:/etc/nginx/conf.d
|
||||
- ./auth:/etc/nginx/conf.d
|
||||
- ./auth/nginx.conf:/etc/nginx/nginx.conf:ro
|
||||
|
||||
registry:
|
||||
image: registry:2
|
||||
ports:
|
||||
- 127.0.0.1:5000:5000
|
||||
volumes:
|
||||
- `pwd`/data:/var/lib/registry
|
||||
- `pwd`./data:/var/lib/registry
|
||||
EOF
|
||||
```
|
||||
|
||||
@ -172,9 +180,9 @@ Now, start your stack:
|
||||
|
||||
docker-compose up -d
|
||||
|
||||
Login with a "push" authorized user (using `testuserpush` and `testpasswordpush`), then tag and push your first image:
|
||||
Login with a "push" authorized user (using `testuser` and `testpassword`), then tag and push your first image:
|
||||
|
||||
docker login myregistrydomain.com:5043
|
||||
docker login -p=testuser -u=testpassword -e=root@example.ch myregistrydomain.com:5043
|
||||
docker tag ubuntu myregistrydomain.com:5043/test
|
||||
docker push myregistrydomain.com:5043/test
|
||||
docker pull myregistrydomain.com:5043/test
|
||||
|
Loading…
Reference in New Issue
Block a user