$PORT should always override port in --bind-addr

This commit is contained in:
Anmol Sethi 2020-05-14 21:57:10 -04:00
parent 89c5a4dfea
commit 73b2ff0945
No known key found for this signature in database
GPG Key ID: 8CEF1878FF10ADEB
2 changed files with 9 additions and 7 deletions

View File

@ -53,14 +53,17 @@ code-server
```bash ```bash
brew install code-server brew install code-server
brew service start code-server brew services start code-server
# Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml # Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml
``` ```
### Docker ### Docker
```bash ```bash
docker run -it -p 127.0.0.1:8080:8080 -v "$PWD:/home/coder/project" -u "$(id -u):$(id -g)" codercom/code-server:latest docker run -it -p 127.0.0.1:8080:8080 \
-v "$PWD:/home/coder/project" \
-u "$(id -u):$(id -g)" \
codercom/code-server:latest
``` ```
This will start a code-server container and expose it at http://127.0.0.1:8080. It will also mount This will start a code-server container and expose it at http://127.0.0.1:8080. It will also mount

View File

@ -380,6 +380,10 @@ function bindAddrFromArgs(addr: Addr, args: Args): Addr {
if (args.host) { if (args.host) {
addr.host = args.host addr.host = args.host
} }
if (process.env.PORT) {
addr.port = parseInt(process.env.PORT, 10)
}
if (args.port !== undefined) { if (args.port !== undefined) {
addr.port = args.port addr.port = args.port
} }
@ -393,11 +397,6 @@ export function bindAddrFromAllSources(cliArgs: Args, configArgs: Args): [string
} }
addr = bindAddrFromArgs(addr, configArgs) addr = bindAddrFromArgs(addr, configArgs)
if (process.env.PORT) {
addr.port = parseInt(process.env.PORT, 10)
}
addr = bindAddrFromArgs(addr, cliArgs) addr = bindAddrFromArgs(addr, cliArgs)
return [addr.host, addr.port] return [addr.host, addr.port]