Skip to content

Commit 12271c6

Browse files
HishamHisham
authored andcommitted
fix env var name
1 parent 6daab5f commit 12271c6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ for this to work it requires inserting a root CA certificate into system trusted
8787
- `hostname`s listed here should be listed in the REGISTRIES environment as well, so they can be intercepted.
8888
- Env `AUTH_REGISTRIES_DELIMITER` to change the separator between authentication info. By default, a space: "` `". If you use keys that contain spaces (as with Google Cloud Registry), you should update this variable, e.g. setting it to `AUTH_REGISTRIES_DELIMITER=";;;"`. In that case, `AUTH_REGISTRIES` could contain something like `registry1.com:user1:pass1;;;registry2.com:user2:pass2`.
8989
- Env `AUTH_REGISTRY_DELIMITER` to change the separator between authentication info *parts*. By default, a colon: "`:`". If you use keys that contain single colons, you should update this variable, e.g. setting it to `AUTH_REGISTRIES_DELIMITER=":::"`. In that case, `AUTH_REGISTRIES` could contain something like `registry1.com:::user1:::pass1 registry2.com:::user2:::pass2`.
90-
- Env `UPSTREAM_MAPPING` to configure upstream server mappings (similar in functionality to /etc/hosts entries but with round-robin selection).
91-
Useful when configured resolvers are unable to resolve a host. e.g. `UPSTREAM_MAPPING="registry1=10.0.1.10:443,10.0.1.11 registry2=5.0.1.10"`
90+
- Env `UPSTREAM_MAPPINGS` to configure upstream server mappings (similar in functionality to /etc/hosts entries but with round-robin selection).
91+
Useful when configured resolvers are unable to resolve a host. e.g. `UPSTREAM_MAPPINGS="registry1=10.0.1.10:443,10.0.1.11 registry2=5.0.1.10"`
9292
- Timeouts ENVS - all of them can pe specified to control different timeouts, and if not set, the defaults will be the ones from `Dockerfile`. The directives will be added into `http` block.:
9393
- SEND_TIMEOUT : see [send_timeout](http://nginx.org/en/docs/http/ngx_http_core_module.html#send_timeout)
9494
- CLIENT_BODY_TIMEOUT : see [client_body_timeout](http://nginx.org/en/docs/http/ngx_http_core_module.html#client_body_timeout)

entrypoint.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ else
3939
fi
4040

4141
# Generate nginx upstream blocks into file. Function similar to a /etc/hosts file but includes round-robin selection
42-
# e.g when UPSTREAM_MAPPING="registry1=10.0.1.10:443,10.0.1.11 registry2=5.0.1.10", the following file is generated
42+
# e.g when UPSTREAM_MAPPINGS="registry1=10.0.1.10:443,10.0.1.11 registry2=5.0.1.10", the following file is generated
4343
# upstream registry1 {
4444
# server 10.0.1.10:443;
4545
# server 10.0.1.11;
@@ -49,9 +49,9 @@ fi
4949
# }
5050
echo -n "" >> /etc/nginx/upstreams.conf
5151

52-
if [ "$UPSTREAM_MAPPING" ]; then
52+
if [ "$UPSTREAM_MAPPINGS" ]; then
5353

54-
for UPSTREAM in ${UPSTREAM_MAPPING}; do
54+
for UPSTREAM in ${UPSTREAM_MAPPINGS}; do
5555
echo "upstream ${UPSTREAM%=*} {" >> /etc/nginx/upstreams.conf
5656
comma_separated_hosts="${UPSTREAM#*=}"
5757
hosts=`echo $comma_separated_hosts | tr ',' ' '`

0 commit comments

Comments
 (0)