Skip to content

Improve Local Setup - Support Windows, Single config file, Updated Docker Guide #559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
config/local.js
config/mock.local.js
config/m2m.local.js
local/seed/
scripts/import-from-api/
node_modules
dist
.ebextensions
Expand Down
220 changes: 116 additions & 104 deletions README.md

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion config/development.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@
"pubsubQueueName": "dev.project.service",
"pubsubExchangeName": "dev.projects",
"attachmentsS3Bucket": "topcoder-dev-media",
"connectProjectsUrl": "https://connect.topcoder-dev.com/projects/"
"connectProjectsUrl": "https://connect.topcoder-dev.com/projects/",
"fileServiceEndpoint": "https://api.topcoder-dev.com/v3/files/",
"connectProjectsUrl": "https://connect.topcoder-dev.com/projects/",
"memberServiceEndpoint": "https://api.topcoder-dev.com/v3/members"
}
25 changes: 0 additions & 25 deletions local/docker-compose.yml

This file was deleted.

29 changes: 17 additions & 12 deletions local/full/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
version: "2"
services:
jsonserver:
extends:
file: ../docker-compose.yml
service: jsonserver
build: "../mock-services"
ports:
- "3001:3001"
db:
extends:
file: ../docker-compose.yml
service: db
build: "../postgres-db"
ports:
- "5432:5432"
environment:
- POSTGRES_PASSWORD=mysecretpassword
- POSTGRES_USER=coder
- POSTGRES_MULTIPLE_DATABASES=projectsdb,projectsdb_test,tc_notifications
esearch:
extends:
file: ../docker-compose.yml
service: esearch
image: "elasticsearch:2.3"
ports:
- "9200:9200"
- "9300:9300"
queue:
extends:
file: ../docker-compose.yml
service: queue
image: "rabbitmq:3-management"
restart: always
ports:
- "5672:5672"
- "15672:15672"
zookeeper:
image: wurstmeister/zookeeper
ports:
Expand Down
23 changes: 23 additions & 0 deletions local/light/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
version: "2"
services:
jsonserver:
extends:
file: ../full/docker-compose.yml
service: jsonserver

db:
extends:
file: ../full/docker-compose.yml
service: db
environment:
- POSTGRES_MULTIPLE_DATABASES=projectsdb,projectsdb_test

esearch:
extends:
file: ../full/docker-compose.yml
service: esearch

queue:
extends:
file: ../full/docker-compose.yml
service: queue
52 changes: 52 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 21 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,30 @@
"node": ">=12"
},
"scripts": {
"lint": "./node_modules/.bin/eslint .",
"lint:fix": "./node_modules/.bin/eslint . --fix || true",
"lint": "eslint .",
"lint:fix": "eslint . --fix || true",
"build": "babel src -d dist --presets es2015 --copy-files",
"sync:all": "NODE_ENV=development npm run sync:db && NODE_ENV=development npm run sync:es",
"sync:db": "./node_modules/.bin/babel-node migrations/sync.js",
"sync:es": "./node_modules/.bin/babel-node migrations/elasticsearch_sync.js",
"prestart": "npm run -s build",
"start": "node dist",
"start:dev": "NODE_ENV=development PORT=8001 nodemon -w src --exec \"node --require dotenv/config --require babel-core/register src\" | ./node_modules/.bin/bunyan",
"start:dev": "cross-env NODE_ENV=development PORT=8001 nodemon -w src --exec \"npm run babel-node-script -- src\" | bunyan",
"startKafkaConsumers": "npm run -s build && node dist/index-kafka.js",
"startKafkaConsumers:dev": "NODE_ENV=development nodemon -w src --exec \"babel-node src/index-kafka.js --presets es2015\" | ./node_modules/.bin/bunyan",
"test": "NODE_ENV=test npm run lint && NODE_ENV=test npm run sync:es && NODE_ENV=test npm run sync:db && NODE_ENV=test ./node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha -- --timeout 10000 --require babel-core/register $(find src -path '*spec.js*') --exit",
"test:watch": "NODE_ENV=test ./node_modules/.bin/mocha -w --require babel-core/register $(find src -path '*spec.js*')",
"demo-data": "babel-node local/seed",
"es-db-compare": "babel-node scripts/es-db-compare",
"data:export": "NODE_ENV=development LOG_LEVEL=info node --require dotenv/config --require babel-core/register scripts/data/export",
"data:import": "NODE_ENV=development LOG_LEVEL=info node --require dotenv/config --require babel-core/register scripts/data/import",
"local:docker:up": "docker-compose -f ./local/full/docker-compose.yml up -d",
"local:docker:down": "docker-compose -f ./local/full/docker-compose.yml down",
"local:docker:logs": "docker-compose -f ./local/full/docker-compose.yml logs",
"local:init": "npm run sync:all && npm run data:import",
"generate:doc:permissions": "babel-node scripts/permissions-doc",
"generate:doc:permissions:dev": "nodemon --watch scripts/permissions-doc --watch src --ext js,jsx,hbs --exec babel-node scripts/permissions-doc"
"startKafkaConsumers:dev": "cross-env NODE_ENV=development nodemon -w src --exec \"npm run babel-node-script src/index-kafka.js\" | bunyan",
"test": "cross-env NODE_ENV=test npm run lint && cross-env NODE_ENV=test npm run reset:all && cross-env NODE_ENV=test istanbul cover node_modules/mocha/bin/_mocha -- --timeout 10000 --require babel-core/register \"./src/**/*.spec.js*\" --exit",
"test:watch": "cross-env NODE_ENV=test mocha -w --require babel-core/register \"./src/**/*.spec.js*\" ",
"reset:all": "npm run reset:db && npm run reset:es",
"reset:db": "npm run babel-node-script -- migrations/sync.js",
"reset:es": "npm run babel-node-script -- migrations/elasticsearch_sync.js",
"import-from-api": "npm run babel-node-script -- scripts/import-from-api",
"es-db-compare": "npm run babel-node-script -- scripts/es-db-compare",
"data:export": "cross-env NODE_ENV=development LOG_LEVEL=info npm run babel-node-script -- scripts/data/export",
"data:import": "cross-env NODE_ENV=development LOG_LEVEL=info npm run babel-node-script -- scripts/data/import",
"services:up": "docker-compose -f ./local/full/docker-compose.yml up -d",
"services:down": "docker-compose -f ./local/full/docker-compose.yml down",
"services:logs": "docker-compose -f ./local/full/docker-compose.yml logs",
"local:init": "npm run reset:all && npm run data:import",
"babel-node-script": "node --require dotenv/config --require babel-core/register",
"generate:doc:permissions": "npm run babel-node-script -- scripts/permissions-doc",
"generate:doc:permissions:dev": "nodemon --watch scripts/permissions-doc --watch src --ext js,jsx,hbs --exec --exec \"npm run babel-node-script scripts/permissions-doc\""
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -90,6 +91,7 @@
"bunyan": "^1.8.12",
"chai": "^3.5.0",
"chai-as-promised": "^7.1.1",
"cross-env": "^7.0.2",
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^11.1.0",
"eslint-plugin-import": "^2.2.0",
Expand Down
File renamed without changes.
File renamed without changes.
Loading