Skip to content

Commit ab930cb

Browse files
authored
chore: nginx-proxy default branch renamed to main (#778)
1 parent 595d52c commit ab930cb

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

docs/Advanced-usage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
Please read and try [basic usage](./Basic-usage.md), and **validate that you have a working two containers setup** before using the three containers setup. In addition to the steps described there, running **nginx-proxy** as two separate containers with **acme-companion** requires the following:
88

9-
1) Download and mount the template file [nginx.tmpl](https://github.com/nginx-proxy/nginx-proxy/blob/master/nginx.tmpl) into the **docker-gen** container. You can get the nginx.tmpl file with a command like:
9+
1) Download and mount the template file [nginx.tmpl](https://github.com/nginx-proxy/nginx-proxy/blob/main/nginx.tmpl) into the **docker-gen** container. You can get the nginx.tmpl file with a command like:
1010

1111
```
12-
curl https://raw.githubusercontent.com/nginx-proxy/nginx-proxy/master/nginx.tmpl > /path/to/nginx.tmpl
12+
curl https://raw.githubusercontent.com/nginx-proxy/nginx-proxy/main/nginx.tmpl > /path/to/nginx.tmpl
1313
```
1414

1515
2) Use the `com.github.jrcs.letsencrypt_nginx_proxy_companion.docker_gen` label on the **docker-gen** container, or explicitly set the `NGINX_DOCKER_GEN_CONTAINER` environment variable on the **acme-companion** container to the name or id of the **docker-gen** container (we'll use the later method in the example).

docs/Docker-Compose.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ volumes:
106106
acme:
107107
```
108108

109-
**Note:** don't forget to replace `/path/to/nginx.tmpl` with the actual path to the [`nginx.tmpl`](https://raw.githubusercontent.com/nginx-proxy/nginx-proxy/master/nginx.tmpl) file you downloaded.
109+
**Note:** don't forget to replace `/path/to/nginx.tmpl` with the actual path to the [`nginx.tmpl`](https://raw.githubusercontent.com/nginx-proxy/nginx-proxy/main/nginx.tmpl) file you downloaded.
110110

111111
### Other (external) examples
112112

docs/Invalid-authorizations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Both are required. Every domain on `LETSENCRYPT_HOST`**must** be on `VIRTUAL_HOS
5454

5555
#### you are using an outdated version of either **acme-companion** or the nginx.tmpl file (if running a 3 containers setup)
5656

57-
Pull `nginxproxy/acme-companion:latest` again and get the latest [latest nginx.tmpl](https://raw.githubusercontent.com/nginx-proxy/nginx-proxy/master/nginx.tmpl).
57+
Pull `nginxproxy/acme-companion:latest` again and get the latest [latest nginx.tmpl](https://raw.githubusercontent.com/nginx-proxy/nginx-proxy/main/nginx.tmpl).
5858

5959

6060
***

test/setup/docker-gen/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ ENV DOCKER_GEN_VERSION=0.7.4 \
3232
COPY --from=build-docker-gen /go/src/github.com/jwilder/docker-gen/docker-gen /usr/local/bin/
3333

3434
# Get latest nginx.tmpl
35-
ADD https://raw.githubusercontent.com/nginx-proxy/nginx-proxy/master/nginx.tmpl /etc/docker-gen/templates/
35+
ADD https://raw.githubusercontent.com/nginx-proxy/nginx-proxy/main/nginx.tmpl /etc/docker-gen/templates/
3636

3737
ENTRYPOINT ["/usr/local/bin/docker-gen"]

test/setup/nginx-proxy/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ COPY --from=go-builder /go/src/github.com/jwilder/docker-gen/docker-gen /usr/loc
5353

5454
# Install nginx-proxy
5555
RUN mkdir /src /app \
56-
&& curl -sSL https://github.com/nginx-proxy/nginx-proxy/archive/master.tar.gz \
56+
&& curl -sSL https://github.com/nginx-proxy/nginx-proxy/archive/main.tar.gz \
5757
| tar -C /src -xz \
58-
&& cp /src/nginx-proxy-master/Procfile /app/ \
59-
&& cp /src/nginx-proxy-master/dhparam.pem.default /app/ \
60-
&& cp /src/nginx-proxy-master/docker-entrypoint.sh /app/ \
61-
&& cp /src/nginx-proxy-master/generate-dhparam.sh /app/ \
62-
&& cp /src/nginx-proxy-master/nginx.tmpl /app/ \
63-
&& cp /src/nginx-proxy-master/network_internal.conf /etc/nginx/ \
58+
&& cp /src/nginx-proxy-main/Procfile /app/ \
59+
&& cp /src/nginx-proxy-main/dhparam.pem.default /app/ \
60+
&& cp /src/nginx-proxy-main/docker-entrypoint.sh /app/ \
61+
&& cp /src/nginx-proxy-main/generate-dhparam.sh /app/ \
62+
&& cp /src/nginx-proxy-main/nginx.tmpl /app/ \
63+
&& cp /src/nginx-proxy-main/network_internal.conf /etc/nginx/ \
6464
&& rm -rf /src
6565

6666
WORKDIR /app

test/setup/setup-nginx-proxy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ case $SETUP in
3434
;;
3535

3636
3containers)
37-
curl https://raw.githubusercontent.com/nginx-proxy/nginx-proxy/master/nginx.tmpl > "${GITHUB_WORKSPACE}/nginx.tmpl"
37+
curl https://raw.githubusercontent.com/nginx-proxy/nginx-proxy/main/nginx.tmpl > "${GITHUB_WORKSPACE}/nginx.tmpl"
3838

3939
docker run -d -p 80:80 -p 443:443 \
4040
--name "$NGINX_CONTAINER_NAME" \

0 commit comments

Comments
 (0)