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
1 changed files with 63 additions and 55 deletions
|
@ -71,21 +71,27 @@ Create the main nginx configuration you will use.
|
||||||
```
|
```
|
||||||
|
|
||||||
cat <<EOF > auth/nginx.conf
|
cat <<EOF > auth/nginx.conf
|
||||||
upstream docker-registry {
|
events {
|
||||||
server registry:5000;
|
worker_connections 1024;
|
||||||
}
|
}
|
||||||
|
|
||||||
## Set a variable to help us decide if we need to add the
|
http {
|
||||||
## 'Docker-Distribution-Api-Version' header.
|
|
||||||
## The registry always sets this header.
|
upstream docker-registry {
|
||||||
## In the case of nginx performing auth, the header will be unset
|
server registry:5000;
|
||||||
## since nginx is auth-ing before proxying.
|
}
|
||||||
map \$upstream_http_docker_distribution_api_version \$docker_distribution_api_version {
|
|
||||||
|
## 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' '';
|
'registry/2.0' '';
|
||||||
default registry/2.0;
|
default registry/2.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 443 ssl;
|
listen 443 ssl;
|
||||||
server_name myregistrydomain.com;
|
server_name myregistrydomain.com;
|
||||||
|
|
||||||
|
@ -127,14 +133,15 @@ server {
|
||||||
proxy_set_header X-Forwarded-Proto \$scheme;
|
proxy_set_header X-Forwarded-Proto \$scheme;
|
||||||
proxy_read_timeout 900;
|
proxy_read_timeout 900;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
EOF
|
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
|
Copy over your certificate files
|
||||||
|
@ -155,14 +162,15 @@ nginx:
|
||||||
links:
|
links:
|
||||||
- registry:registry
|
- registry:registry
|
||||||
volumes:
|
volumes:
|
||||||
- `pwd`/auth/:/etc/nginx/conf.d
|
- ./auth:/etc/nginx/conf.d
|
||||||
|
- ./auth/nginx.conf:/etc/nginx/nginx.conf:ro
|
||||||
|
|
||||||
registry:
|
registry:
|
||||||
image: registry:2
|
image: registry:2
|
||||||
ports:
|
ports:
|
||||||
- 127.0.0.1:5000:5000
|
- 127.0.0.1:5000:5000
|
||||||
volumes:
|
volumes:
|
||||||
- `pwd`/data:/var/lib/registry
|
- `pwd`./data:/var/lib/registry
|
||||||
EOF
|
EOF
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -172,9 +180,9 @@ Now, start your stack:
|
||||||
|
|
||||||
docker-compose up -d
|
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 tag ubuntu myregistrydomain.com:5043/test
|
||||||
docker push myregistrydomain.com:5043/test
|
docker push myregistrydomain.com:5043/test
|
||||||
docker pull myregistrydomain.com:5043/test
|
docker pull myregistrydomain.com:5043/test
|
||||||
|
|
Loading…
Reference in a new issue