From e2cebf00b7d6f356645873339ac3a0c530935463 Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Fri, 7 May 2021 12:56:14 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Use=20official=20image=20env=20var?= =?UTF-8?q?=20by=20default?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: mathieu.brunot --- images/4.2/alpine/Dockerfile | 26 ++++++++++++++---------- images/4.2/alpine/entrypoint.sh | 36 ++++++++++++++++----------------- images/5.0/alpine/Dockerfile | 26 ++++++++++++++---------- images/5.0/alpine/entrypoint.sh | 36 ++++++++++++++++----------------- images/5.5/alpine/Dockerfile | 26 ++++++++++++++---------- images/5.5/alpine/entrypoint.sh | 36 ++++++++++++++++----------------- images/6.0/alpine/Dockerfile | 26 ++++++++++++++---------- images/6.0/alpine/entrypoint.sh | 36 ++++++++++++++++----------------- template/Dockerfile.alpine | 26 ++++++++++++++---------- template/entrypoint.sh | 36 ++++++++++++++++----------------- 10 files changed, 165 insertions(+), 145 deletions(-) diff --git a/images/4.2/alpine/Dockerfile b/images/4.2/alpine/Dockerfile index 8cf83e8..9bdeb97 100644 --- a/images/4.2/alpine/Dockerfile +++ b/images/4.2/alpine/Dockerfile @@ -40,7 +40,7 @@ RUN set -ex; \ ## Runtime environment variables # Taiga nginx, back, front and events properties -ENV TAIGA_HOSTNAME=localhost \ +ENV TAIGA_SITES_DOMAIN=localhost \ TAIGA_SSL=False \ TAIGA_SSL_BY_REVERSE_PROXY=False \ TAIGA_BACKEND_SSL=False \ @@ -49,20 +49,24 @@ ENV TAIGA_HOSTNAME=localhost \ TAIGA_DEFAULT_LANGUAGE=en \ TAIGA_THEMES= \ TAIGA_DEFAULT_THEME=taiga \ - TAIGA_PUBLIC_REGISTER_ENABLED=false \ - TAIGA_FEEDBACK_ENABLED=false \ - TAIGA_SUPPORT_URL=https://tree.taiga.io/support \ - TAIGA_PRIVACY_POLICY_URL= \ - TAIGA_TOS_URL= \ - TAIGA_GDPR_URL= \ - TAIGA_MAX_UPLOAD_SIZE=104857600 \ + PUBLIC_REGISTER_ENABLED=false \ + FEEDBACK_ENABLED=false \ + SUPPORT_URL=https://resources.taiga.io/ \ + PRIVACY_POLICY_URL= \ + TOS_URL= \ + GDPR_URL= \ + MAX_UPLOAD_SIZE=104857600 \ TAIGA_CONTRIB_PLUGINS= \ TAIGA_IMPORTERS= \ - TAIGA_GRAVATAR=true \ - TAIGA_LOGIN_FORM_TYPE=normal \ + ENABLE_GITHUB_IMPORTER= \ + ENABLE_JIRA_IMPORTER= \ + ENABLE_TRELLO_IMPORTER= \ + ENABLE_ASANA_IMPORTER= \ + ENABLE_GRAVATAR=true \ + LOGIN_FORM_TYPE=normal \ TAIGA_BACK_HOST=taigaback \ TAIGA_BACK_PORT=8001 \ - TAIGA_EVENTS_ENABLED= \ + EVENTS_ENABLED= \ TAIGA_EVENTS_HOST=taigaevents \ TAIGA_EVENTS_PORT=8888 diff --git a/images/4.2/alpine/entrypoint.sh b/images/4.2/alpine/entrypoint.sh index 2e7b544..d371aa1 100755 --- a/images/4.2/alpine/entrypoint.sh +++ b/images/4.2/alpine/entrypoint.sh @@ -117,10 +117,10 @@ if [ -n "${TAIGA_FEEDBACK_ENABLED:-$FEEDBACK_ENABLED}" ]; then /taiga/conf.json fi -if [ -n "${TAIGA_SUPPORT_URL}" ]; then - log "Updating Taiga Front support URL: ${TAIGA_SUPPORT_URL}" +if [ -n "${TAIGA_SUPPORT_URL:-$SUPPORT_URL}" ]; then + log "Updating Taiga Front support URL: ${TAIGA_SUPPORT_URL:-$SUPPORT_URL}" sed -i \ - -e "s|\"supportUrl\": .*,|\"supportUrl\": \"${TAIGA_SUPPORT_URL}\",|g" \ + -e "s|\"supportUrl\": .*,|\"supportUrl\": \"${TAIGA_SUPPORT_URL:-$SUPPORT_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front support URL" @@ -129,10 +129,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_PRIVACY_POLICY_URL}" ]; then - log "Updating Taiga Front privacy policy URL: ${TAIGA_PRIVACY_POLICY_URL}" +if [ -n "${TAIGA_PRIVACY_POLICY_URL:-$PRIVACY_POLICY_URL}" ]; then + log "Updating Taiga Front privacy policy URL: ${TAIGA_PRIVACY_POLICY_URL:-$PRIVACY_POLICY_URL}" sed -i \ - -e "s|\"privacyPolicyUrl\": .*,|\"privacyPolicyUrl\": \"${TAIGA_PRIVACY_POLICY_URL}\",|g" \ + -e "s|\"privacyPolicyUrl\": .*,|\"privacyPolicyUrl\": \"${TAIGA_PRIVACY_POLICY_URL:-$PRIVACY_POLICY_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front privacy policy URL" @@ -141,10 +141,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_TOS_URL}" ]; then - log "Updating Taiga Front terms of services URL: ${TAIGA_TOS_URL}" +if [ -n "${TAIGA_TOS_URL:-$TOS_URL}" ]; then + log "Updating Taiga Front terms of services URL: ${TAIGA_TOS_URL:-$TOS_URL}" sed -i \ - -e "s|\"termsOfServiceUrl\": .*,|\"termsOfServiceUrl\": \"${TAIGA_TOS_URL}\",|g" \ + -e "s|\"termsOfServiceUrl\": .*,|\"termsOfServiceUrl\": \"${TAIGA_TOS_URL:-$TOS_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front terms of services URL" @@ -153,10 +153,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_GDPR_URL}" ]; then - log "Updating Taiga Front GDPR compliance URL: ${TAIGA_GDPR_URL}" +if [ -n "${TAIGA_GDPR_URL:-$GDPR_URL}" ]; then + log "Updating Taiga Front GDPR compliance URL: ${TAIGA_GDPR_URL:-$GDPR_URL}" sed -i \ - -e "s|\"GDPRUrl\": .*,|\"GDPRUrl\": \"${TAIGA_GDPR_URL}\",|g" \ + -e "s|\"GDPRUrl\": .*,|\"GDPRUrl\": \"${TAIGA_GDPR_URL:-$GDPR_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front GDPR compliance URL" @@ -165,10 +165,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_MAX_UPLOAD_SIZE}" ]; then - log "Updating Taiga Front max upload file size: ${TAIGA_MAX_UPLOAD_SIZE}" +if [ -n "${TAIGA_MAX_UPLOAD_SIZE:-$MAX_UPLOAD_SIZE}" ]; then + log "Updating Taiga Front max upload file size: ${TAIGA_MAX_UPLOAD_SIZE:-$MAX_UPLOAD_SIZE}" sed -i \ - -e "s|\"maxUploadFileSize\": .*,|\"maxUploadFileSize\": ${TAIGA_MAX_UPLOAD_SIZE},|g" \ + -e "s|\"maxUploadFileSize\": .*,|\"maxUploadFileSize\": ${TAIGA_MAX_UPLOAD_SIZE:-$MAX_UPLOAD_SIZE},|g" \ /taiga/conf.json else log "Reset Taiga Front GDPR URL" @@ -244,10 +244,10 @@ if [ -n "${TAIGA_GRAVATAR:-$ENABLE_GRAVATAR}" ]; then /taiga/conf.json fi -if [ -n "${TAIGA_LOGIN_FORM_TYPE}" ]; then - log "Updating Taiga Front login form type: ${TAIGA_LOGIN_FORM_TYPE}" +if [ -n "${TAIGA_LOGIN_FORM_TYPE:-$LOGIN_FORM_TYPE}" ]; then + log "Updating Taiga Front login form type: ${TAIGA_LOGIN_FORM_TYPE:-$LOGIN_FORM_TYPE}" sed -i \ - -e "s|\"loginFormType\": \".*\"|\"loginFormType\": \"${TAIGA_LOGIN_FORM_TYPE}\"|g" \ + -e "s|\"loginFormType\": \".*\"|\"loginFormType\": \"${TAIGA_LOGIN_FORM_TYPE:-$LOGIN_FORM_TYPE}\"|g" \ /taiga/conf.json else log "Reset Taiga Front login form type" diff --git a/images/5.0/alpine/Dockerfile b/images/5.0/alpine/Dockerfile index 708f7d6..75305ec 100644 --- a/images/5.0/alpine/Dockerfile +++ b/images/5.0/alpine/Dockerfile @@ -40,7 +40,7 @@ RUN set -ex; \ ## Runtime environment variables # Taiga nginx, back, front and events properties -ENV TAIGA_HOSTNAME=localhost \ +ENV TAIGA_SITES_DOMAIN=localhost \ TAIGA_SSL=False \ TAIGA_SSL_BY_REVERSE_PROXY=False \ TAIGA_BACKEND_SSL=False \ @@ -49,20 +49,24 @@ ENV TAIGA_HOSTNAME=localhost \ TAIGA_DEFAULT_LANGUAGE=en \ TAIGA_THEMES= \ TAIGA_DEFAULT_THEME=taiga \ - TAIGA_PUBLIC_REGISTER_ENABLED=false \ - TAIGA_FEEDBACK_ENABLED=false \ - TAIGA_SUPPORT_URL=https://tree.taiga.io/support \ - TAIGA_PRIVACY_POLICY_URL= \ - TAIGA_TOS_URL= \ - TAIGA_GDPR_URL= \ - TAIGA_MAX_UPLOAD_SIZE=104857600 \ + PUBLIC_REGISTER_ENABLED=false \ + FEEDBACK_ENABLED=false \ + SUPPORT_URL=https://resources.taiga.io/ \ + PRIVACY_POLICY_URL= \ + TOS_URL= \ + GDPR_URL= \ + MAX_UPLOAD_SIZE=104857600 \ TAIGA_CONTRIB_PLUGINS= \ TAIGA_IMPORTERS= \ - TAIGA_GRAVATAR=true \ - TAIGA_LOGIN_FORM_TYPE=normal \ + ENABLE_GITHUB_IMPORTER= \ + ENABLE_JIRA_IMPORTER= \ + ENABLE_TRELLO_IMPORTER= \ + ENABLE_ASANA_IMPORTER= \ + ENABLE_GRAVATAR=true \ + LOGIN_FORM_TYPE=normal \ TAIGA_BACK_HOST=taigaback \ TAIGA_BACK_PORT=8001 \ - TAIGA_EVENTS_ENABLED= \ + EVENTS_ENABLED= \ TAIGA_EVENTS_HOST=taigaevents \ TAIGA_EVENTS_PORT=8888 diff --git a/images/5.0/alpine/entrypoint.sh b/images/5.0/alpine/entrypoint.sh index 2e7b544..d371aa1 100755 --- a/images/5.0/alpine/entrypoint.sh +++ b/images/5.0/alpine/entrypoint.sh @@ -117,10 +117,10 @@ if [ -n "${TAIGA_FEEDBACK_ENABLED:-$FEEDBACK_ENABLED}" ]; then /taiga/conf.json fi -if [ -n "${TAIGA_SUPPORT_URL}" ]; then - log "Updating Taiga Front support URL: ${TAIGA_SUPPORT_URL}" +if [ -n "${TAIGA_SUPPORT_URL:-$SUPPORT_URL}" ]; then + log "Updating Taiga Front support URL: ${TAIGA_SUPPORT_URL:-$SUPPORT_URL}" sed -i \ - -e "s|\"supportUrl\": .*,|\"supportUrl\": \"${TAIGA_SUPPORT_URL}\",|g" \ + -e "s|\"supportUrl\": .*,|\"supportUrl\": \"${TAIGA_SUPPORT_URL:-$SUPPORT_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front support URL" @@ -129,10 +129,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_PRIVACY_POLICY_URL}" ]; then - log "Updating Taiga Front privacy policy URL: ${TAIGA_PRIVACY_POLICY_URL}" +if [ -n "${TAIGA_PRIVACY_POLICY_URL:-$PRIVACY_POLICY_URL}" ]; then + log "Updating Taiga Front privacy policy URL: ${TAIGA_PRIVACY_POLICY_URL:-$PRIVACY_POLICY_URL}" sed -i \ - -e "s|\"privacyPolicyUrl\": .*,|\"privacyPolicyUrl\": \"${TAIGA_PRIVACY_POLICY_URL}\",|g" \ + -e "s|\"privacyPolicyUrl\": .*,|\"privacyPolicyUrl\": \"${TAIGA_PRIVACY_POLICY_URL:-$PRIVACY_POLICY_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front privacy policy URL" @@ -141,10 +141,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_TOS_URL}" ]; then - log "Updating Taiga Front terms of services URL: ${TAIGA_TOS_URL}" +if [ -n "${TAIGA_TOS_URL:-$TOS_URL}" ]; then + log "Updating Taiga Front terms of services URL: ${TAIGA_TOS_URL:-$TOS_URL}" sed -i \ - -e "s|\"termsOfServiceUrl\": .*,|\"termsOfServiceUrl\": \"${TAIGA_TOS_URL}\",|g" \ + -e "s|\"termsOfServiceUrl\": .*,|\"termsOfServiceUrl\": \"${TAIGA_TOS_URL:-$TOS_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front terms of services URL" @@ -153,10 +153,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_GDPR_URL}" ]; then - log "Updating Taiga Front GDPR compliance URL: ${TAIGA_GDPR_URL}" +if [ -n "${TAIGA_GDPR_URL:-$GDPR_URL}" ]; then + log "Updating Taiga Front GDPR compliance URL: ${TAIGA_GDPR_URL:-$GDPR_URL}" sed -i \ - -e "s|\"GDPRUrl\": .*,|\"GDPRUrl\": \"${TAIGA_GDPR_URL}\",|g" \ + -e "s|\"GDPRUrl\": .*,|\"GDPRUrl\": \"${TAIGA_GDPR_URL:-$GDPR_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front GDPR compliance URL" @@ -165,10 +165,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_MAX_UPLOAD_SIZE}" ]; then - log "Updating Taiga Front max upload file size: ${TAIGA_MAX_UPLOAD_SIZE}" +if [ -n "${TAIGA_MAX_UPLOAD_SIZE:-$MAX_UPLOAD_SIZE}" ]; then + log "Updating Taiga Front max upload file size: ${TAIGA_MAX_UPLOAD_SIZE:-$MAX_UPLOAD_SIZE}" sed -i \ - -e "s|\"maxUploadFileSize\": .*,|\"maxUploadFileSize\": ${TAIGA_MAX_UPLOAD_SIZE},|g" \ + -e "s|\"maxUploadFileSize\": .*,|\"maxUploadFileSize\": ${TAIGA_MAX_UPLOAD_SIZE:-$MAX_UPLOAD_SIZE},|g" \ /taiga/conf.json else log "Reset Taiga Front GDPR URL" @@ -244,10 +244,10 @@ if [ -n "${TAIGA_GRAVATAR:-$ENABLE_GRAVATAR}" ]; then /taiga/conf.json fi -if [ -n "${TAIGA_LOGIN_FORM_TYPE}" ]; then - log "Updating Taiga Front login form type: ${TAIGA_LOGIN_FORM_TYPE}" +if [ -n "${TAIGA_LOGIN_FORM_TYPE:-$LOGIN_FORM_TYPE}" ]; then + log "Updating Taiga Front login form type: ${TAIGA_LOGIN_FORM_TYPE:-$LOGIN_FORM_TYPE}" sed -i \ - -e "s|\"loginFormType\": \".*\"|\"loginFormType\": \"${TAIGA_LOGIN_FORM_TYPE}\"|g" \ + -e "s|\"loginFormType\": \".*\"|\"loginFormType\": \"${TAIGA_LOGIN_FORM_TYPE:-$LOGIN_FORM_TYPE}\"|g" \ /taiga/conf.json else log "Reset Taiga Front login form type" diff --git a/images/5.5/alpine/Dockerfile b/images/5.5/alpine/Dockerfile index e746261..e44cb4a 100644 --- a/images/5.5/alpine/Dockerfile +++ b/images/5.5/alpine/Dockerfile @@ -40,7 +40,7 @@ RUN set -ex; \ ## Runtime environment variables # Taiga nginx, back, front and events properties -ENV TAIGA_HOSTNAME=localhost \ +ENV TAIGA_SITES_DOMAIN=localhost \ TAIGA_SSL=False \ TAIGA_SSL_BY_REVERSE_PROXY=False \ TAIGA_BACKEND_SSL=False \ @@ -49,20 +49,24 @@ ENV TAIGA_HOSTNAME=localhost \ TAIGA_DEFAULT_LANGUAGE=en \ TAIGA_THEMES= \ TAIGA_DEFAULT_THEME=taiga \ - TAIGA_PUBLIC_REGISTER_ENABLED=false \ - TAIGA_FEEDBACK_ENABLED=false \ - TAIGA_SUPPORT_URL=https://tree.taiga.io/support \ - TAIGA_PRIVACY_POLICY_URL= \ - TAIGA_TOS_URL= \ - TAIGA_GDPR_URL= \ - TAIGA_MAX_UPLOAD_SIZE=104857600 \ + PUBLIC_REGISTER_ENABLED=false \ + FEEDBACK_ENABLED=false \ + SUPPORT_URL=https://resources.taiga.io/ \ + PRIVACY_POLICY_URL= \ + TOS_URL= \ + GDPR_URL= \ + MAX_UPLOAD_SIZE=104857600 \ TAIGA_CONTRIB_PLUGINS= \ TAIGA_IMPORTERS= \ - TAIGA_GRAVATAR=true \ - TAIGA_LOGIN_FORM_TYPE=normal \ + ENABLE_GITHUB_IMPORTER= \ + ENABLE_JIRA_IMPORTER= \ + ENABLE_TRELLO_IMPORTER= \ + ENABLE_ASANA_IMPORTER= \ + ENABLE_GRAVATAR=true \ + LOGIN_FORM_TYPE=normal \ TAIGA_BACK_HOST=taigaback \ TAIGA_BACK_PORT=8001 \ - TAIGA_EVENTS_ENABLED= \ + EVENTS_ENABLED= \ TAIGA_EVENTS_HOST=taigaevents \ TAIGA_EVENTS_PORT=8888 diff --git a/images/5.5/alpine/entrypoint.sh b/images/5.5/alpine/entrypoint.sh index 2e7b544..d371aa1 100755 --- a/images/5.5/alpine/entrypoint.sh +++ b/images/5.5/alpine/entrypoint.sh @@ -117,10 +117,10 @@ if [ -n "${TAIGA_FEEDBACK_ENABLED:-$FEEDBACK_ENABLED}" ]; then /taiga/conf.json fi -if [ -n "${TAIGA_SUPPORT_URL}" ]; then - log "Updating Taiga Front support URL: ${TAIGA_SUPPORT_URL}" +if [ -n "${TAIGA_SUPPORT_URL:-$SUPPORT_URL}" ]; then + log "Updating Taiga Front support URL: ${TAIGA_SUPPORT_URL:-$SUPPORT_URL}" sed -i \ - -e "s|\"supportUrl\": .*,|\"supportUrl\": \"${TAIGA_SUPPORT_URL}\",|g" \ + -e "s|\"supportUrl\": .*,|\"supportUrl\": \"${TAIGA_SUPPORT_URL:-$SUPPORT_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front support URL" @@ -129,10 +129,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_PRIVACY_POLICY_URL}" ]; then - log "Updating Taiga Front privacy policy URL: ${TAIGA_PRIVACY_POLICY_URL}" +if [ -n "${TAIGA_PRIVACY_POLICY_URL:-$PRIVACY_POLICY_URL}" ]; then + log "Updating Taiga Front privacy policy URL: ${TAIGA_PRIVACY_POLICY_URL:-$PRIVACY_POLICY_URL}" sed -i \ - -e "s|\"privacyPolicyUrl\": .*,|\"privacyPolicyUrl\": \"${TAIGA_PRIVACY_POLICY_URL}\",|g" \ + -e "s|\"privacyPolicyUrl\": .*,|\"privacyPolicyUrl\": \"${TAIGA_PRIVACY_POLICY_URL:-$PRIVACY_POLICY_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front privacy policy URL" @@ -141,10 +141,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_TOS_URL}" ]; then - log "Updating Taiga Front terms of services URL: ${TAIGA_TOS_URL}" +if [ -n "${TAIGA_TOS_URL:-$TOS_URL}" ]; then + log "Updating Taiga Front terms of services URL: ${TAIGA_TOS_URL:-$TOS_URL}" sed -i \ - -e "s|\"termsOfServiceUrl\": .*,|\"termsOfServiceUrl\": \"${TAIGA_TOS_URL}\",|g" \ + -e "s|\"termsOfServiceUrl\": .*,|\"termsOfServiceUrl\": \"${TAIGA_TOS_URL:-$TOS_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front terms of services URL" @@ -153,10 +153,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_GDPR_URL}" ]; then - log "Updating Taiga Front GDPR compliance URL: ${TAIGA_GDPR_URL}" +if [ -n "${TAIGA_GDPR_URL:-$GDPR_URL}" ]; then + log "Updating Taiga Front GDPR compliance URL: ${TAIGA_GDPR_URL:-$GDPR_URL}" sed -i \ - -e "s|\"GDPRUrl\": .*,|\"GDPRUrl\": \"${TAIGA_GDPR_URL}\",|g" \ + -e "s|\"GDPRUrl\": .*,|\"GDPRUrl\": \"${TAIGA_GDPR_URL:-$GDPR_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front GDPR compliance URL" @@ -165,10 +165,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_MAX_UPLOAD_SIZE}" ]; then - log "Updating Taiga Front max upload file size: ${TAIGA_MAX_UPLOAD_SIZE}" +if [ -n "${TAIGA_MAX_UPLOAD_SIZE:-$MAX_UPLOAD_SIZE}" ]; then + log "Updating Taiga Front max upload file size: ${TAIGA_MAX_UPLOAD_SIZE:-$MAX_UPLOAD_SIZE}" sed -i \ - -e "s|\"maxUploadFileSize\": .*,|\"maxUploadFileSize\": ${TAIGA_MAX_UPLOAD_SIZE},|g" \ + -e "s|\"maxUploadFileSize\": .*,|\"maxUploadFileSize\": ${TAIGA_MAX_UPLOAD_SIZE:-$MAX_UPLOAD_SIZE},|g" \ /taiga/conf.json else log "Reset Taiga Front GDPR URL" @@ -244,10 +244,10 @@ if [ -n "${TAIGA_GRAVATAR:-$ENABLE_GRAVATAR}" ]; then /taiga/conf.json fi -if [ -n "${TAIGA_LOGIN_FORM_TYPE}" ]; then - log "Updating Taiga Front login form type: ${TAIGA_LOGIN_FORM_TYPE}" +if [ -n "${TAIGA_LOGIN_FORM_TYPE:-$LOGIN_FORM_TYPE}" ]; then + log "Updating Taiga Front login form type: ${TAIGA_LOGIN_FORM_TYPE:-$LOGIN_FORM_TYPE}" sed -i \ - -e "s|\"loginFormType\": \".*\"|\"loginFormType\": \"${TAIGA_LOGIN_FORM_TYPE}\"|g" \ + -e "s|\"loginFormType\": \".*\"|\"loginFormType\": \"${TAIGA_LOGIN_FORM_TYPE:-$LOGIN_FORM_TYPE}\"|g" \ /taiga/conf.json else log "Reset Taiga Front login form type" diff --git a/images/6.0/alpine/Dockerfile b/images/6.0/alpine/Dockerfile index 2528ccb..ae79534 100644 --- a/images/6.0/alpine/Dockerfile +++ b/images/6.0/alpine/Dockerfile @@ -40,7 +40,7 @@ RUN set -ex; \ ## Runtime environment variables # Taiga nginx, back, front and events properties -ENV TAIGA_HOSTNAME=localhost \ +ENV TAIGA_SITES_DOMAIN=localhost \ TAIGA_SSL=False \ TAIGA_SSL_BY_REVERSE_PROXY=False \ TAIGA_BACKEND_SSL=False \ @@ -49,20 +49,24 @@ ENV TAIGA_HOSTNAME=localhost \ TAIGA_DEFAULT_LANGUAGE=en \ TAIGA_THEMES= \ TAIGA_DEFAULT_THEME=taiga \ - TAIGA_PUBLIC_REGISTER_ENABLED=false \ - TAIGA_FEEDBACK_ENABLED=false \ - TAIGA_SUPPORT_URL=https://tree.taiga.io/support \ - TAIGA_PRIVACY_POLICY_URL= \ - TAIGA_TOS_URL= \ - TAIGA_GDPR_URL= \ - TAIGA_MAX_UPLOAD_SIZE=104857600 \ + PUBLIC_REGISTER_ENABLED=false \ + FEEDBACK_ENABLED=false \ + SUPPORT_URL=https://resources.taiga.io/ \ + PRIVACY_POLICY_URL= \ + TOS_URL= \ + GDPR_URL= \ + MAX_UPLOAD_SIZE=104857600 \ TAIGA_CONTRIB_PLUGINS= \ TAIGA_IMPORTERS= \ - TAIGA_GRAVATAR=true \ - TAIGA_LOGIN_FORM_TYPE=normal \ + ENABLE_GITHUB_IMPORTER= \ + ENABLE_JIRA_IMPORTER= \ + ENABLE_TRELLO_IMPORTER= \ + ENABLE_ASANA_IMPORTER= \ + ENABLE_GRAVATAR=true \ + LOGIN_FORM_TYPE=normal \ TAIGA_BACK_HOST=taigaback \ TAIGA_BACK_PORT=8001 \ - TAIGA_EVENTS_ENABLED= \ + EVENTS_ENABLED= \ TAIGA_EVENTS_HOST=taigaevents \ TAIGA_EVENTS_PORT=8888 diff --git a/images/6.0/alpine/entrypoint.sh b/images/6.0/alpine/entrypoint.sh index 2e7b544..d371aa1 100755 --- a/images/6.0/alpine/entrypoint.sh +++ b/images/6.0/alpine/entrypoint.sh @@ -117,10 +117,10 @@ if [ -n "${TAIGA_FEEDBACK_ENABLED:-$FEEDBACK_ENABLED}" ]; then /taiga/conf.json fi -if [ -n "${TAIGA_SUPPORT_URL}" ]; then - log "Updating Taiga Front support URL: ${TAIGA_SUPPORT_URL}" +if [ -n "${TAIGA_SUPPORT_URL:-$SUPPORT_URL}" ]; then + log "Updating Taiga Front support URL: ${TAIGA_SUPPORT_URL:-$SUPPORT_URL}" sed -i \ - -e "s|\"supportUrl\": .*,|\"supportUrl\": \"${TAIGA_SUPPORT_URL}\",|g" \ + -e "s|\"supportUrl\": .*,|\"supportUrl\": \"${TAIGA_SUPPORT_URL:-$SUPPORT_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front support URL" @@ -129,10 +129,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_PRIVACY_POLICY_URL}" ]; then - log "Updating Taiga Front privacy policy URL: ${TAIGA_PRIVACY_POLICY_URL}" +if [ -n "${TAIGA_PRIVACY_POLICY_URL:-$PRIVACY_POLICY_URL}" ]; then + log "Updating Taiga Front privacy policy URL: ${TAIGA_PRIVACY_POLICY_URL:-$PRIVACY_POLICY_URL}" sed -i \ - -e "s|\"privacyPolicyUrl\": .*,|\"privacyPolicyUrl\": \"${TAIGA_PRIVACY_POLICY_URL}\",|g" \ + -e "s|\"privacyPolicyUrl\": .*,|\"privacyPolicyUrl\": \"${TAIGA_PRIVACY_POLICY_URL:-$PRIVACY_POLICY_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front privacy policy URL" @@ -141,10 +141,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_TOS_URL}" ]; then - log "Updating Taiga Front terms of services URL: ${TAIGA_TOS_URL}" +if [ -n "${TAIGA_TOS_URL:-$TOS_URL}" ]; then + log "Updating Taiga Front terms of services URL: ${TAIGA_TOS_URL:-$TOS_URL}" sed -i \ - -e "s|\"termsOfServiceUrl\": .*,|\"termsOfServiceUrl\": \"${TAIGA_TOS_URL}\",|g" \ + -e "s|\"termsOfServiceUrl\": .*,|\"termsOfServiceUrl\": \"${TAIGA_TOS_URL:-$TOS_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front terms of services URL" @@ -153,10 +153,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_GDPR_URL}" ]; then - log "Updating Taiga Front GDPR compliance URL: ${TAIGA_GDPR_URL}" +if [ -n "${TAIGA_GDPR_URL:-$GDPR_URL}" ]; then + log "Updating Taiga Front GDPR compliance URL: ${TAIGA_GDPR_URL:-$GDPR_URL}" sed -i \ - -e "s|\"GDPRUrl\": .*,|\"GDPRUrl\": \"${TAIGA_GDPR_URL}\",|g" \ + -e "s|\"GDPRUrl\": .*,|\"GDPRUrl\": \"${TAIGA_GDPR_URL:-$GDPR_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front GDPR compliance URL" @@ -165,10 +165,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_MAX_UPLOAD_SIZE}" ]; then - log "Updating Taiga Front max upload file size: ${TAIGA_MAX_UPLOAD_SIZE}" +if [ -n "${TAIGA_MAX_UPLOAD_SIZE:-$MAX_UPLOAD_SIZE}" ]; then + log "Updating Taiga Front max upload file size: ${TAIGA_MAX_UPLOAD_SIZE:-$MAX_UPLOAD_SIZE}" sed -i \ - -e "s|\"maxUploadFileSize\": .*,|\"maxUploadFileSize\": ${TAIGA_MAX_UPLOAD_SIZE},|g" \ + -e "s|\"maxUploadFileSize\": .*,|\"maxUploadFileSize\": ${TAIGA_MAX_UPLOAD_SIZE:-$MAX_UPLOAD_SIZE},|g" \ /taiga/conf.json else log "Reset Taiga Front GDPR URL" @@ -244,10 +244,10 @@ if [ -n "${TAIGA_GRAVATAR:-$ENABLE_GRAVATAR}" ]; then /taiga/conf.json fi -if [ -n "${TAIGA_LOGIN_FORM_TYPE}" ]; then - log "Updating Taiga Front login form type: ${TAIGA_LOGIN_FORM_TYPE}" +if [ -n "${TAIGA_LOGIN_FORM_TYPE:-$LOGIN_FORM_TYPE}" ]; then + log "Updating Taiga Front login form type: ${TAIGA_LOGIN_FORM_TYPE:-$LOGIN_FORM_TYPE}" sed -i \ - -e "s|\"loginFormType\": \".*\"|\"loginFormType\": \"${TAIGA_LOGIN_FORM_TYPE}\"|g" \ + -e "s|\"loginFormType\": \".*\"|\"loginFormType\": \"${TAIGA_LOGIN_FORM_TYPE:-$LOGIN_FORM_TYPE}\"|g" \ /taiga/conf.json else log "Reset Taiga Front login form type" diff --git a/template/Dockerfile.alpine b/template/Dockerfile.alpine index d117ce5..c4b0a6b 100644 --- a/template/Dockerfile.alpine +++ b/template/Dockerfile.alpine @@ -40,7 +40,7 @@ RUN set -ex; \ ## Runtime environment variables # Taiga nginx, back, front and events properties -ENV TAIGA_HOSTNAME=localhost \ +ENV TAIGA_SITES_DOMAIN=localhost \ TAIGA_SSL=False \ TAIGA_SSL_BY_REVERSE_PROXY=False \ TAIGA_BACKEND_SSL=False \ @@ -49,20 +49,24 @@ ENV TAIGA_HOSTNAME=localhost \ TAIGA_DEFAULT_LANGUAGE=en \ TAIGA_THEMES= \ TAIGA_DEFAULT_THEME=taiga \ - TAIGA_PUBLIC_REGISTER_ENABLED=false \ - TAIGA_FEEDBACK_ENABLED=false \ - TAIGA_SUPPORT_URL=https://tree.taiga.io/support \ - TAIGA_PRIVACY_POLICY_URL= \ - TAIGA_TOS_URL= \ - TAIGA_GDPR_URL= \ - TAIGA_MAX_UPLOAD_SIZE=104857600 \ + PUBLIC_REGISTER_ENABLED=false \ + FEEDBACK_ENABLED=false \ + SUPPORT_URL=https://resources.taiga.io/ \ + PRIVACY_POLICY_URL= \ + TOS_URL= \ + GDPR_URL= \ + MAX_UPLOAD_SIZE=104857600 \ TAIGA_CONTRIB_PLUGINS= \ TAIGA_IMPORTERS= \ - TAIGA_GRAVATAR=true \ - TAIGA_LOGIN_FORM_TYPE=normal \ + ENABLE_GITHUB_IMPORTER= \ + ENABLE_JIRA_IMPORTER= \ + ENABLE_TRELLO_IMPORTER= \ + ENABLE_ASANA_IMPORTER= \ + ENABLE_GRAVATAR=true \ + LOGIN_FORM_TYPE=normal \ TAIGA_BACK_HOST=taigaback \ TAIGA_BACK_PORT=8001 \ - TAIGA_EVENTS_ENABLED= \ + EVENTS_ENABLED= \ TAIGA_EVENTS_HOST=taigaevents \ TAIGA_EVENTS_PORT=8888 diff --git a/template/entrypoint.sh b/template/entrypoint.sh index 2e7b544..d371aa1 100755 --- a/template/entrypoint.sh +++ b/template/entrypoint.sh @@ -117,10 +117,10 @@ if [ -n "${TAIGA_FEEDBACK_ENABLED:-$FEEDBACK_ENABLED}" ]; then /taiga/conf.json fi -if [ -n "${TAIGA_SUPPORT_URL}" ]; then - log "Updating Taiga Front support URL: ${TAIGA_SUPPORT_URL}" +if [ -n "${TAIGA_SUPPORT_URL:-$SUPPORT_URL}" ]; then + log "Updating Taiga Front support URL: ${TAIGA_SUPPORT_URL:-$SUPPORT_URL}" sed -i \ - -e "s|\"supportUrl\": .*,|\"supportUrl\": \"${TAIGA_SUPPORT_URL}\",|g" \ + -e "s|\"supportUrl\": .*,|\"supportUrl\": \"${TAIGA_SUPPORT_URL:-$SUPPORT_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front support URL" @@ -129,10 +129,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_PRIVACY_POLICY_URL}" ]; then - log "Updating Taiga Front privacy policy URL: ${TAIGA_PRIVACY_POLICY_URL}" +if [ -n "${TAIGA_PRIVACY_POLICY_URL:-$PRIVACY_POLICY_URL}" ]; then + log "Updating Taiga Front privacy policy URL: ${TAIGA_PRIVACY_POLICY_URL:-$PRIVACY_POLICY_URL}" sed -i \ - -e "s|\"privacyPolicyUrl\": .*,|\"privacyPolicyUrl\": \"${TAIGA_PRIVACY_POLICY_URL}\",|g" \ + -e "s|\"privacyPolicyUrl\": .*,|\"privacyPolicyUrl\": \"${TAIGA_PRIVACY_POLICY_URL:-$PRIVACY_POLICY_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front privacy policy URL" @@ -141,10 +141,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_TOS_URL}" ]; then - log "Updating Taiga Front terms of services URL: ${TAIGA_TOS_URL}" +if [ -n "${TAIGA_TOS_URL:-$TOS_URL}" ]; then + log "Updating Taiga Front terms of services URL: ${TAIGA_TOS_URL:-$TOS_URL}" sed -i \ - -e "s|\"termsOfServiceUrl\": .*,|\"termsOfServiceUrl\": \"${TAIGA_TOS_URL}\",|g" \ + -e "s|\"termsOfServiceUrl\": .*,|\"termsOfServiceUrl\": \"${TAIGA_TOS_URL:-$TOS_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front terms of services URL" @@ -153,10 +153,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_GDPR_URL}" ]; then - log "Updating Taiga Front GDPR compliance URL: ${TAIGA_GDPR_URL}" +if [ -n "${TAIGA_GDPR_URL:-$GDPR_URL}" ]; then + log "Updating Taiga Front GDPR compliance URL: ${TAIGA_GDPR_URL:-$GDPR_URL}" sed -i \ - -e "s|\"GDPRUrl\": .*,|\"GDPRUrl\": \"${TAIGA_GDPR_URL}\",|g" \ + -e "s|\"GDPRUrl\": .*,|\"GDPRUrl\": \"${TAIGA_GDPR_URL:-$GDPR_URL}\",|g" \ /taiga/conf.json else log "Reset Taiga Front GDPR compliance URL" @@ -165,10 +165,10 @@ else /taiga/conf.json fi -if [ -n "${TAIGA_MAX_UPLOAD_SIZE}" ]; then - log "Updating Taiga Front max upload file size: ${TAIGA_MAX_UPLOAD_SIZE}" +if [ -n "${TAIGA_MAX_UPLOAD_SIZE:-$MAX_UPLOAD_SIZE}" ]; then + log "Updating Taiga Front max upload file size: ${TAIGA_MAX_UPLOAD_SIZE:-$MAX_UPLOAD_SIZE}" sed -i \ - -e "s|\"maxUploadFileSize\": .*,|\"maxUploadFileSize\": ${TAIGA_MAX_UPLOAD_SIZE},|g" \ + -e "s|\"maxUploadFileSize\": .*,|\"maxUploadFileSize\": ${TAIGA_MAX_UPLOAD_SIZE:-$MAX_UPLOAD_SIZE},|g" \ /taiga/conf.json else log "Reset Taiga Front GDPR URL" @@ -244,10 +244,10 @@ if [ -n "${TAIGA_GRAVATAR:-$ENABLE_GRAVATAR}" ]; then /taiga/conf.json fi -if [ -n "${TAIGA_LOGIN_FORM_TYPE}" ]; then - log "Updating Taiga Front login form type: ${TAIGA_LOGIN_FORM_TYPE}" +if [ -n "${TAIGA_LOGIN_FORM_TYPE:-$LOGIN_FORM_TYPE}" ]; then + log "Updating Taiga Front login form type: ${TAIGA_LOGIN_FORM_TYPE:-$LOGIN_FORM_TYPE}" sed -i \ - -e "s|\"loginFormType\": \".*\"|\"loginFormType\": \"${TAIGA_LOGIN_FORM_TYPE}\"|g" \ + -e "s|\"loginFormType\": \".*\"|\"loginFormType\": \"${TAIGA_LOGIN_FORM_TYPE:-$LOGIN_FORM_TYPE}\"|g" \ /taiga/conf.json else log "Reset Taiga Front login form type"