Skip to content

Commit

Permalink
Merge pull request #86 from marmelab/main
Browse files Browse the repository at this point in the history
Deploy v2.0.1
  • Loading branch information
benoitchazoule authored Jul 24, 2024
2 parents 896e8a5 + 61110be commit 764c886
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ DESCRIPTION
Create an analysis on GreenFrame server.
```
_See code: [dist/commands/analyze.ts](https://github.com/marmelab/greenframe-cli/blob/v2.0.0/dist/commands/analyze.ts)_
_See code: [dist/commands/analyze.ts](https://github.com/marmelab/greenframe-cli/blob/v2.0.1/dist/commands/analyze.ts)_
## `greenframe kube-config`
Expand All @@ -292,7 +292,7 @@ DESCRIPTION
greenframe kube-config
```
_See code: [dist/commands/kube-config.ts](https://github.com/marmelab/greenframe-cli/blob/v2.0.0/dist/commands/kube-config.ts)_
_See code: [dist/commands/kube-config.ts](https://github.com/marmelab/greenframe-cli/blob/v2.0.1/dist/commands/kube-config.ts)_
## `greenframe open [BASEURL] [SCENARIO]`
Expand All @@ -319,7 +319,7 @@ DESCRIPTION
greenframe analyze ./yourScenario.js https://greenframe.io
```
_See code: [dist/commands/open.ts](https://github.com/marmelab/greenframe-cli/blob/v2.0.0/dist/commands/open.ts)_
_See code: [dist/commands/open.ts](https://github.com/marmelab/greenframe-cli/blob/v2.0.1/dist/commands/open.ts)_
## `greenframe update [CHANNEL]`
Expand All @@ -338,7 +338,7 @@ DESCRIPTION
greenframe update
```
_See code: [dist/commands/update.ts](https://github.com/marmelab/greenframe-cli/blob/v2.0.0/dist/commands/update.ts)_
_See code: [dist/commands/update.ts](https://github.com/marmelab/greenframe-cli/blob/v2.0.1/dist/commands/update.ts)_
<!-- commandsstop -->
## Development
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "greenframe-cli",
"description": "Official GreenFrame CLI",
"version": "2.0.0",
"version": "2.0.1",
"author": "Marmelab",
"bin": {
"greenframe": "./bin/run"
Expand Down
4 changes: 2 additions & 2 deletions src/bash/getHostIP.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ if command -v ip 1> /dev/null;
then
if ip -4 addr show docker0 > /dev/null 2>&1 # Docker0 is network for docker under linux and OSX
then
printf $(ip -4 addr show docker0 | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
printf $(ip -4 addr show docker0 | grep -oE '[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}' | head -1)
else
printf $(ip -4 addr show eth0 | grep -oP '(?<=inet\s)\d+(\.\d+){3}') # eth0 is network for docker under wsl
printf $(ip -4 addr show eth0 | grep -oE '[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}' | head -1) # eth0 is network for docker under wsl
fi
else
printf $(ifconfig | grep 'inet ' | grep -v 127.0.0.1 | awk '{ print $2 }' | head -1 | sed -n 's/[^0-9]*\([0-9\.]*\)/\1/p')
Expand Down

0 comments on commit 764c886

Please sign in to comment.