ereuse/devicehub-django
9
0
Fork 0
Code Issues 6 Pull requests 12 Packages Projects Releases Wiki Activity

WIP: cálculo de impacto ambiental #59

Draft
pedro wants to merge 91 commits from feature/f31-device-enviromental-impact into main
pull from: feature/f31-device-enviromental-impact
merge into: ereuse:main
Conversation 0 Commits 91 Files changed 20 +2 -2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 85bae67189 - Show all commits

4
docker/devicehub-django.entrypoint.sh
View file

@ -34,7 +34,7 @@ gen_env_vars() {
ADMIN='True'
PREDEFINED_TOKEN="${PREDEFINED_TOKEN:-}"
# specific dpp env vars
if [ "${DPP}" = 'true' ]; then
if [ "${DPP:-}" = 'true' ]; then
# fill env vars in this docker entrypoint
wait_for_dpp_shared
export API_DLT='http://api_connector:3010'
@ -129,7 +129,7 @@ config_phase() {
# TODO: one error on add_user, and you don't add user anymore
./manage.py add_user "${INIT_ORG}" "${INIT_USER}" "${INIT_PASSWD}" "${ADMIN}" "${PREDEFINED_TOKEN}"
if [ "${DPP}" = 'true' ]; then
if [ "${DPP:-}" = 'true' ]; then
# 12, 13, 14
config_dpp_part1