Skip to content

Commit fde0e80

Browse files
committed
chore: jwilder/docker-gen > nginx-proxy/docker-gen
1 parent 679c971 commit fde0e80

6 files changed

+10
-9
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ FROM gobuilder as dockergen
1010

1111
ARG DOCKER_GEN_VERSION
1212

13-
RUN git clone https://github.com/jwilder/docker-gen \
13+
RUN git clone https://github.com/nginx-proxy/docker-gen \
1414
&& cd /go/docker-gen \
1515
&& git -c advice.detachedHead=false checkout $DOCKER_GEN_VERSION \
1616
&& go mod download \

Dockerfile.alpine

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ FROM gobuilder as dockergen
1111

1212
ARG DOCKER_GEN_VERSION
1313

14-
RUN git clone https://github.com/jwilder/docker-gen \
14+
RUN git clone https://github.com/nginx-proxy/docker-gen \
1515
&& cd /go/docker-gen \
1616
&& git -c advice.detachedHead=false checkout $DOCKER_GEN_VERSION \
1717
&& go mod download \

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ docker run -d -e VIRTUAL_HOST=foo.bar.com nginx
193193

194194
### Separate Containers
195195

196-
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.
196+
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.
197197

198198
You may want to do this to prevent having the docker socket bound to a publicly exposed container service.
199199

@@ -224,7 +224,7 @@ Then start the docker-gen container with the shared volume and template:
224224
docker run --volumes-from nginx \
225225
-v /var/run/docker.sock:/tmp/docker.sock:ro \
226226
-v $(pwd):/etc/docker-gen/templates \
227-
-t jwilder/docker-gen -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
227+
-t nginxproxy/docker-gen -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
228228
```
229229

230230
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
259259

260260
> 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`.
261261
262-
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`.
262+
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`.
263263

264264
Set `DHPARAM_SKIP` environment variable to `true` to disable using default Diffie-Hellman parameters. The default value is `false`.
265265

docker-compose-separate-containers.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ services:
99
- /etc/nginx/conf.d
1010

1111
dockergen:
12-
image: jwilder/docker-gen
13-
command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
12+
image: nginxproxy/docker-gen
13+
command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl
14+
/etc/nginx/conf.d/default.conf
1415
volumes_from:
1516
- nginx
1617
volumes:

test/test_dockergen/test_dockergen_v2.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ services:
88
- /etc/nginx/conf.d
99

1010
dockergen:
11-
image: jwilder/docker-gen
11+
image: nginxproxy/docker-gen
1212
command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
1313
volumes_from:
1414
- nginx

test/test_dockergen/test_dockergen_v3.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
- nginx_conf:/etc/nginx/conf.d
88

99
dockergen:
10-
image: jwilder/docker-gen
10+
image: nginxproxy/docker-gen
1111
command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
1212
volumes:
1313
- /var/run/docker.sock:/tmp/docker.sock:ro

0 commit comments

Comments
 (0)