diff --git a/config/podverse-db.env.example b/config/podverse-db.env.example index b747b81e..fed977e4 100644 --- a/config/podverse-db.env.example +++ b/config/podverse-db.env.example @@ -1,7 +1,4 @@ POSTGRES_DB=postgres POSTGRES_USER=postgres -POSTGRES_PASSWORD= +POSTGRES_PASSWORD=mysecretpw PGDATA=/var/lib/postgresql/data/pgdata/ - -POSTGRES_READ_PASSWORD= -POSTGRES_READ_WRITE_PASSWORD= diff --git a/config/podverse-mq.env.example b/config/podverse-mq.env.example index 7d870b77..339c45d7 100644 --- a/config/podverse-mq.env.example +++ b/config/podverse-mq.env.example @@ -1,2 +1,2 @@ -ARTEMIS_USER= -ARTEMIS_PASSWORD= +ARTEMIS_USER=user +ARTEMIS_PASSWORD=mysecretpw diff --git a/dev/local-dev-setup.md b/dev/local-dev-setup.md index bdc33517..fb468320 100644 --- a/dev/local-dev-setup.md +++ b/dev/local-dev-setup.md @@ -26,21 +26,21 @@ The `v5` infrastructure is highly modularized. You will need to clone all of the I am listing them in a top-down order (ex. `podverse-helpers` is used by everything, `podverse-orm` is used by `podverse-parser` and `podverse-api` etc.): - [podverse-ops](https://github.com/podverse/podverse-ops/blob/v5-develop/) -- [podverse-helpers](https://github.com/podverse/podverse-ops/blob/v5-develop/) +- [podverse-helpers](https://github.com/podverse/podverse-helpers/blob/v5-develop/) - [podverse-external-services](https://github.com/podverse/podverse-external-services/blob/v5-develop/) - [podverse-orm](https://github.com/podverse/podverse-orm/blob/v5-develop/) - [podverse-parser](https://github.com/podverse/podverse-parser/blob/v5-develop/) - [podverse-mq](https://github.com/podverse/podverse-mq/blob/v5-develop/) - [podverse-api](https://github.com/podverse/podverse-api/blob/v5-develop/) - [podverse-web](https://github.com/podverse/podverse-web/blob/v5-develop/) -- [podverse-workers](https://github.com/podverse/podverse-web/blob/v5-develop/) +- [podverse-workers](https://github.com/podverse/podverse-workers/blob/v5-develop/) - [podverse-qa](https://github.com/podverse/podverse-qa/blob/v5-develop/) ## Environment Variables Before running a Podverse Docker service, you will need to create an enviroment variable file for it within the `podverse-ops/config` directory. -Duplicate each of the `.env.example` files found within `podverse-ops/config` and add the corresponding values. +Duplicate each of the `.env.example` files found within `podverse-ops/config` and add the corresponding values (e.g. podverse-local-api.env, etc.). The Podverse repos that run locally (the ones that don't simply need to build, but need to run) will need their own `.env` file within their project directory for local development purposes. For example, for local dev, you will need a corresponding `podverse-api/.env` file, `podverse-web/.env`, and a `podverse-workers/.env` file. diff --git a/dev/npm-link-modules.sh b/dev/npm-link-modules.sh index 894dd58b..85ab5055 100755 --- a/dev/npm-link-modules.sh +++ b/dev/npm-link-modules.sh @@ -24,75 +24,93 @@ echo "Clearing npm cache..." npm cache clean --force echo "Installing podverse-helpers dependencies..." -cd ../podverse-helpers +cd ../podverse-helpers || exit 1 +[ -f .nvmrc ] || { echo "Missing .nvmrc in $(pwd)"; exit 1; } +nvm install nvm use rm -rf node_modules rm -rf dist -rm package-lock.json +rm -f package-lock.json npm install echo "Installing podverse-external-services dependencies..." -cd ../podverse-external-services +cd ../podverse-external-services || exit 1 +[ -f .nvmrc ] || { echo "Missing .nvmrc in $(pwd)"; exit 1; } +nvm install nvm use rm -rf node_modules rm -rf dist -rm package-lock.json +rm -f package-lock.json npm install echo "Installing podverse-orm dependencies..." -cd ../podverse-orm +cd ../podverse-orm || exit 1 +[ -f .nvmrc ] || { echo "Missing .nvmrc in $(pwd)"; exit 1; } +nvm install nvm use rm -rf node_modules rm -rf dist -rm package-lock.json +rm -f package-lock.json npm install echo "Installing podverse-parser dependencies..." -cd ../podverse-parser +cd ../podverse-parser || exit 1 +[ -f .nvmrc ] || { echo "Missing .nvmrc in $(pwd)"; exit 1; } +nvm install nvm use rm -rf node_modules rm -rf dist -rm package-lock.json +rm -f package-lock.json npm install echo "Installing podverse-mq dependencies..." -cd ../podverse-mq +cd ../podverse-mq || exit 1 +[ -f .nvmrc ] || { echo "Missing .nvmrc in $(pwd)"; exit 1; } +nvm install nvm use rm -rf node_modules rm -rf dist -rm package-lock.json +rm -f package-lock.json npm install echo "Installing podverse-workers dependencies..." -cd ../podverse-workers +cd ../podverse-workers || exit 1 +[ -f .nvmrc ] || { echo "Missing .nvmrc in $(pwd)"; exit 1; } +nvm install nvm use rm -rf node_modules rm -rf dist -rm package-lock.json +rm -f package-lock.json npm install echo "Installing podverse-api dependencies..." -cd ../podverse-api +cd ../podverse-api || exit 1 +[ -f .nvmrc ] || { echo "Missing .nvmrc in $(pwd)"; exit 1; } +nvm install nvm use rm -rf node_modules rm -rf dist -rm package-lock.json +rm -f package-lock.json npm install echo "Installing podverse-web dependencies..." -cd ../podverse-web +cd ../podverse-web || exit 1 +[ -f .nvmrc ] || { echo "Missing .nvmrc in $(pwd)"; exit 1; } +nvm install nvm use rm -rf node_modules rm -rf dist -rm package-lock.json +rm -f package-lock.json npm install echo "Installing podverse-qa dependencies..." -cd ../podverse-qa +cd ../podverse-qa || exit 1 +[ -f .nvmrc ] || { echo "Missing .nvmrc in $(pwd)"; exit 1; } +nvm install nvm use rm -rf node_modules rm -rf dist -rm package-lock.json +rm -f package-lock.json npm install # Link dependencies to npm diff --git a/docker-compose/local/db/docker-compose.yml b/docker-compose/local/db/docker-compose.yml index e3775eda..35fec32b 100644 --- a/docker-compose/local/db/docker-compose.yml +++ b/docker-compose/local/db/docker-compose.yml @@ -16,7 +16,7 @@ services: networks: - podverse_local_network volumes: - - podverse_local_db_data:/var/lib/postgresql/data + - podverse_local_db_data:/var/lib/postgresql - ../../../database/combined/init_database.sql:/opt/database/combined/init_database.sql - ../../../database/init-scripts/01-create-users.sh:/opt/database/init-scripts/01-create-users.sh command: >