Skip to content

Commit 68d19a1

Browse files
euanmillareuanmillar
authored
Hotfix for LOCAL_IP (#2754)
* Fix for LOCAL_IP and amended documentation on the yarn dev command * Small doc tweak
1 parent 03d0bd0 commit 68d19a1

File tree

16 files changed

+32
-27
lines changed

16 files changed

+32
-27
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ So you have contributed to core and want to make a new release as an OpenCRVS co
377377

378378
3. Run `yarn test` and ensure all passed.
379379

380-
4. Run `git tag v<version_number>` e.g. `git tag v1.0.0-alpha.3.1`
380+
4. Run `git tag v<version_number>` e.g. `git tag v1.0.0-alpha.3.2`
381381

382382
5. Run `git push origin v<version_number>`
383383

‎dev.sh‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
set -e
1111
DIR=$(cd "$(dirname "$0")"; pwd)
1212

13+
echo
14+
echo -e "This command starts the OpenCRVS Core development environment, which consists of multiple NodeJS microservices running in parallel. OpenCRVS requires a companion country configuration server to also be running. \n\nIf you ran our setup command, the fictional Farajaland country configuration server exists in the directory opencrvs-farajaland alongside this directory, otherwise you may have cloned or forked it somewhere else.\n\nYour country configuration server must understand the path to the directory where OpenCRVS Core is located.\n\nSo, before we start...\n\n1. Copy this command: \033[32myarn dev $DIR\033[0m\n\n2. Create another terminal window.\n\n3. cd into your country config directory and prepare to paste the command, \033[32mWHEN OPENCRVS CORE HAS FULLY STARTED UP\033[0m, in order to start the country config server and be able to use OpenCRVS.\n\nYou know OpenCRVS Core is ready for you to start the country configuration server, when you see this message: \"\033[32m@opencrvs/client: Compiled with warnings.\033[0m\" followed by any NPM dependency warnings."
15+
echo
16+
sleep 3
17+
1318
# Retrieve 2-step verification to continue
1419
#-----------------------------------------
1520
function ask_yes_or_no() {
@@ -19,9 +24,9 @@ function ask_yes_or_no() {
1924
*) echo "no" ;;
2025
esac
2126
}
22-
if [[ "no" == $(ask_yes_or_no "This command starts the OpenCRVS Core development environment. You must run the country config server separately. If your country config is already running, type: yes to continue. If you dont know, type: no to exit.") ]]
27+
if [[ "no" == $(ask_yes_or_no "If you are ready to continue, type: yes. If you dont know, type: no to exit.") ]]
2328
then
24-
echo -e "\n\nExiting OpenCRVS. \n\nIf you ran our setup command, the fictional Farajaland country configuration exists in the directory opencrvs-farajaland alongside this one, otherwise you may have cloned or forked it somewhere else.\n\n1. Create another terminal window.\n\n2. cd into your config directory and type: \n\n\033[32myarn dev $DIR\033[0m\n\nWhen your country config is running, return to this terminal window and try again: \n\n\033[32myarn dev\033[0m\n\n"
29+
echo -e "\n\nExiting OpenCRVS."
2530
exit 0
2631
fi
2732

@@ -47,7 +52,7 @@ export LANGUAGES="en"
4752
if [ $OS == "UBUNTU" ]; then
4853
yarn dev:secrets:gen && concurrently "yarn run start" "yarn run compose:deps"
4954
else
50-
export LOCAL_IP=$(ipconfig getifaddr en0)
55+
export LOCAL_IP=$(ifconfig | grep "inet " | grep -Fv 127.0.0.1 | awk '{print $2}')
5156
yarn dev:secrets:gen && concurrently "yarn run start" "yarn run compose:deps"
5257
fi
5358

‎packages/auth/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opencrvs/auth",
3-
"version": "1.0.0-alpha.3.1",
3+
"version": "1.0.0-alpha.3.2",
44
"description": "OpenCRVS authentication service",
55
"license": "MPL-2.0",
66
"private": true,

‎packages/client/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "@opencrvs/client",
3-
"version": "1.0.0-alpha.3.1",
3+
"version": "1.0.0-alpha.3.2",
44
"description": "OpenCRVS client application",
55
"license": "MPL-2.0",
66
"private": true,
77
"dependencies": {
88
"@craco/craco": "^6.4.3",
9-
"@opencrvs/components": "^1.0.0-alpha.3.1",
9+
"@opencrvs/components": "^1.0.0-alpha.3.2",
1010
"@sentry/browser": "^4.6.3",
1111
"@types/bcryptjs": "^2.4.2",
1212
"@types/history": "^4.6.2",

‎packages/commons/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opencrvs/commons",
3-
"version": "1.0.0-alpha.3.1",
3+
"version": "1.0.0-alpha.3.2",
44
"description": "OpenCRVS common modules and utils",
55
"license": "MPL-2.0",
66
"main": "build/dist/index.js",

‎packages/components/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opencrvs/components",
3-
"version": "1.0.0-alpha.3.1",
3+
"version": "1.0.0-alpha.3.2",
44
"description": "OpenCRVS UI Component library",
55
"license": "MPL-2.0",
66
"private": true,

‎packages/gateway/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opencrvs/gateway",
3-
"version": "1.0.0-alpha.3.1",
3+
"version": "1.0.0-alpha.3.2",
44
"description": "OpenCRVS API Gateway with GraphQL",
55
"license": "MPL-2.0",
66
"scripts": {
@@ -26,7 +26,7 @@
2626
"@graphql-tools/load": "^6.0.9",
2727
"@graphql-tools/schema": "^6.0.9",
2828
"@hapi/hapi": "^20.0.1",
29-
"@opencrvs/commons": "^1.0.0-alpha.3.1",
29+
"@opencrvs/commons": "^1.0.0-alpha.3.2",
3030
"@sentry/node": "^5.10.2",
3131
"@types/archiver": "^3.0.0",
3232
"@types/flat": "^0.0.28",

‎packages/integration/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opencrvs/integration",
3-
"version": "1.0.0-alpha.3.1",
3+
"version": "1.0.0-alpha.3.2",
44
"description": "A set of integration and performance tests for OpenCRVS",
55
"license": "MPL-2.0",
66
"private": true,

‎packages/login/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "@opencrvs/login",
3-
"version": "1.0.0-alpha.3.1",
3+
"version": "1.0.0-alpha.3.2",
44
"description": "OpenCRVS login client application",
55
"license": "MPL-2.0",
66
"private": true,
77
"dependencies": {
88
"@craco/craco": "^6.4.3",
9-
"@opencrvs/components": "^1.0.0-alpha.3.1",
9+
"@opencrvs/components": "^1.0.0-alpha.3.2",
1010
"@sentry/browser": "^4.6.3",
1111
"@types/history": "^4.6.2",
1212
"@types/react-redux": "^7.1.5",

‎packages/metrics/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opencrvs/metrics",
3-
"version": "1.0.0-alpha.3.1",
3+
"version": "1.0.0-alpha.3.2",
44
"description": "OpenCRVS metrics service",
55
"license": "MPL-2.0",
66
"private": true,
@@ -20,7 +20,7 @@
2020
"dependencies": {
2121
"@hapi/boom": "^9.1.1",
2222
"@hapi/hapi": "^20.0.1",
23-
"@opencrvs/commons": "^1.0.0-alpha.3.1",
23+
"@opencrvs/commons": "^1.0.0-alpha.3.2",
2424
"@types/pino": "^6.3.12",
2525
"app-module-path": "^2.2.0",
2626
"archiver": "^3.1.1",

0 commit comments

Comments
 (0)