mirror/ nginx-proxy
1
0
Fork 0
mirror of https://github.com/nginx-proxy/nginx-proxy synced 2024-05-03 22:26:12 +02:00
Code Issues

chore: jwilder/docker-gen > nginx-proxy/docker-gen

This commit is contained in:
Nicolas Duchon 2022-01-11 19:55:29 +01:00
parent 679c971a19
commit fde0e809e4
No known key found for this signature in database
GPG Key ID: EA3151C66A4D79E7
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -10,7 +10,7 @@ FROM gobuilder as dockergen
ARG DOCKER_GEN_VERSION ARG DOCKER_GEN_VERSION
RUN git clone https://github.com/jwilder/docker-gen \ RUN git clone https://github.com/nginx-proxy/docker-gen \
&& cd /go/docker-gen \ && cd /go/docker-gen \
&& git -c advice.detachedHead=false checkout $DOCKER_GEN_VERSION \ && git -c advice.detachedHead=false checkout $DOCKER_GEN_VERSION \
&& go mod download \ && go mod download \

2
Dockerfile.alpine
View File

@ -11,7 +11,7 @@ FROM gobuilder as dockergen
ARG DOCKER_GEN_VERSION ARG DOCKER_GEN_VERSION
RUN git clone https://github.com/jwilder/docker-gen \ RUN git clone https://github.com/nginx-proxy/docker-gen \
&& cd /go/docker-gen \ && cd /go/docker-gen \
&& git -c advice.detachedHead=false checkout $DOCKER_GEN_VERSION \ && git -c advice.detachedHead=false checkout $DOCKER_GEN_VERSION \
&& go mod download \ && go mod download \

6
README.md
View File

@ -193,7 +193,7 @@ docker run -d -e VIRTUAL_HOST=foo.bar.com nginx
### Separate Containers ### Separate Containers
nginx-proxy can also be run as two separate containers using the [jwilder/docker-gen](https://hub.docker.com/r/jwilder/docker-gen) image and the official [nginx](https://registry.hub.docker.com/_/nginx/) image. nginx-proxy can also be run as two separate containers using the [nginxproxy/docker-gen](https://hub.docker.com/r/nginxproxy/docker-gen) image and the official [nginx](https://registry.hub.docker.com/_/nginx/) image.
You may want to do this to prevent having the docker socket bound to a publicly exposed container service. You may want to do this to prevent having the docker socket bound to a publicly exposed container service.
@ -224,7 +224,7 @@ Then start the docker-gen container with the shared volume and template:
docker run --volumes-from nginx \ docker run --volumes-from nginx \
-v /var/run/docker.sock:/tmp/docker.sock:ro \ -v /var/run/docker.sock:/tmp/docker.sock:ro \
-v $(pwd):/etc/docker-gen/templates \ -v $(pwd):/etc/docker-gen/templates \
-t jwilder/docker-gen -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf -t nginxproxy/docker-gen -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
``` ```
Finally, start your containers with `VIRTUAL_HOST` environment variables. Finally, start your containers with `VIRTUAL_HOST` environment variables.
@ -259,7 +259,7 @@ To use custom `dhparam.pem` files per-virtual-host, the files should be named af
> COMPATIBILITY WARNING: The default generated `dhparam.pem` key is 4096 bits for A+ security. Some older clients (like Java 6 and 7) do not support DH keys with over 1024 bits. In order to support these clients, you must provide your own `dhparam.pem`. > COMPATIBILITY WARNING: The default generated `dhparam.pem` key is 4096 bits for A+ security. Some older clients (like Java 6 and 7) do not support DH keys with over 1024 bits. In order to support these clients, you must provide your own `dhparam.pem`.
In the separate container setup, no pre-generated key will be available and neither the [jwilder/docker-gen](https://hub.docker.com/r/jwilder/docker-gen) image, nor the offical [nginx](https://registry.hub.docker.com/_/nginx/) image will provide one. If you still want A+ security in a separate container setup, you should mount an RFC7919 DH key file to the nginx container at `/etc/nginx/dhparam/dhparam.pem`. In the separate container setup, no pre-generated key will be available and neither the [nginxproxy/docker-gen](https://hub.docker.com/r/nginxproxy/docker-gen) image, nor the offical [nginx](https://registry.hub.docker.com/_/nginx/) image will provide one. If you still want A+ security in a separate container setup, you should mount an RFC7919 DH key file to the nginx container at `/etc/nginx/dhparam/dhparam.pem`.
Set `DHPARAM_SKIP` environment variable to `true` to disable using default Diffie-Hellman parameters. The default value is `false`. Set `DHPARAM_SKIP` environment variable to `true` to disable using default Diffie-Hellman parameters. The default value is `false`.

5
docker-compose-separate-containers.yml
View File

@ -9,8 +9,9 @@ services:
- /etc/nginx/conf.d - /etc/nginx/conf.d
dockergen: dockergen:
image: jwilder/docker-gen image: nginxproxy/docker-gen
command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl
/etc/nginx/conf.d/default.conf
volumes_from: volumes_from:
- nginx - nginx
volumes: volumes:

2
test/test_dockergen/test_dockergen_v2.yml
View File

@ -8,7 +8,7 @@ services:
- /etc/nginx/conf.d - /etc/nginx/conf.d
dockergen: dockergen:
image: jwilder/docker-gen image: nginxproxy/docker-gen
command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
volumes_from: volumes_from:
- nginx - nginx

2
test/test_dockergen/test_dockergen_v3.yml
View File

@ -7,7 +7,7 @@ services:
- nginx_conf:/etc/nginx/conf.d - nginx_conf:/etc/nginx/conf.d
dockergen: dockergen:
image: jwilder/docker-gen image: nginxproxy/docker-gen
command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
volumes: volumes:
- /var/run/docker.sock:/tmp/docker.sock:ro - /var/run/docker.sock:/tmp/docker.sock:ro