public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-11-01 09:09:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

change env var name

Browse source
This commit is contained in:
Jonathan Math 2021-06-19 09:49:28 -06:00
parent db1e09a822
commit 65bcb5e9e1
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -6,10 +6,10 @@ CURRENT_GID := $(shell id -g)
#creates newsblur, but does not rebuild images or create keys
start:
- MAKEBUILD=True CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose up -d
- RUNWITHMAKEBUILD=True CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose up -d
metrics:
- MAKEBUILD=True CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose -f docker-compose.yml -f docker-compose.metrics.yml up -d
- RUNWITHMAKEBUILD=True CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose -f docker-compose.yml -f docker-compose.metrics.yml up -d
metrics-ps:
- docker-compose -f docker-compose.yml -f docker-compose.metrics.yml ps
@ -23,7 +23,7 @@ nb: pull
- CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose down
- [[ -d config/certificates ]] && echo "keys exist" || make keys
- cd node && npm install & cd ..
- MAKEBUILD=True CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose up -d --build --remove-orphans
- RUNWITHMAKEBUILD=True CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose up -d --build --remove-orphans
- docker-compose exec newsblur_web ./manage.py migrate
- docker-compose exec newsblur_web ./manage.py loaddata config/fixtures/bootstrap.json

2
docker-compose.yml
View file

@ -7,7 +7,7 @@ services:
image: newsblur/newsblur_${NEWSBLUR_BASE:-python3}:latest
environment:
- DOCKERBUILD=True
- ${MAKEBUILD:?use the `make` command instead of docker CLI}
- RUNWITHMAKEBUILD=${RUNWITHMAKEBUILD?use the `make` command instead of docker CLI}
stdin_open: true
tty: true
restart: unless-stopped