From f3565220ce25322594bba76ae1825d6fe6a6e70c Mon Sep 17 00:00:00 2001 From: Florent Poinsaut <1256948+FlorentPoinsaut@users.noreply.github.com> Date: Wed, 19 Apr 2023 10:42:37 +0200 Subject: [PATCH] Add secrets for cron credentials (#98) * Add secrets for cron credentials * Add secrets for cron credentials for all images * Set CRON var to empty by default as noted in the README + Update README.template with these new secrets. --- README.md | 11 +++++++---- README.template | 11 +++++++---- docker-run.sh | 2 ++ images/11.0.5-php7.4/docker-run.sh | 2 ++ images/12.0.5-php7.4/docker-run.sh | 2 ++ images/13.0.4-php7.4/docker-run.sh | 2 ++ images/14.0.5-php7.4/docker-run.sh | 2 ++ images/15.0.3-php7.4/docker-run.sh | 2 ++ images/16.0.5-php8.1/docker-run.sh | 2 ++ images/17.0.1-php8.1/docker-run.sh | 2 ++ images/develop/docker-run.sh | 2 ++ 11 files changed, 32 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 8332ee1..18a323c 100644 --- a/README.md +++ b/README.md @@ -127,7 +127,10 @@ When setup this way, to upgrade version the use of the web interface is mandator Some environment variables are compatible with docker secrets behaviour, just add the `_FILE` suffix to var name and point the value file to read. Environment variables that are compatible with docker secrets: - - `DOLI_DB_USER` => `DOLI_DB_USER_FILE` - - `DOLI_DB_PASSWORD` => `DOLI_DB_PASSWORD_FILE` - - `DOLI_ADMIN_LOGIN` => `DOLI_ADMIN_LOGIN_FILE` - - `DOLI_ADMIN_PASSWORD` => `DOLI_ADMIN_PASSWORD_FILE` + +* `DOLI_DB_USER` => `DOLI_DB_USER_FILE` +* `DOLI_DB_PASSWORD` => `DOLI_DB_PASSWORD_FILE` +* `DOLI_ADMIN_LOGIN` => `DOLI_ADMIN_LOGIN_FILE` +* `DOLI_ADMIN_PASSWORD` => `DOLI_ADMIN_PASSWORD_FILE` +* `DOLI_CRON_KEY` => `DOLI_CRON_KEY_FILE` +* `DOLI_CRON_USER` => `DOLI_CRON_USER_FILE` diff --git a/README.template b/README.template index ef73a8c..974502e 100644 --- a/README.template +++ b/README.template @@ -119,7 +119,10 @@ When setup this way, to upgrade version the use of the web interface is mandator Some environment variables are compatible with docker secrets behaviour, just add the `_FILE` suffix to var name and point the value file to read. Environment variables that are compatible with docker secrets: - - `DOLI_DB_USER` => `DOLI_DB_USER_FILE` - - `DOLI_DB_PASSWORD` => `DOLI_DB_PASSWORD_FILE` - - `DOLI_ADMIN_LOGIN` => `DOLI_ADMIN_LOGIN_FILE` - - `DOLI_ADMIN_PASSWORD` => `DOLI_ADMIN_PASSWORD_FILE` + +* `DOLI_DB_USER` => `DOLI_DB_USER_FILE` +* `DOLI_DB_PASSWORD` => `DOLI_DB_PASSWORD_FILE` +* `DOLI_ADMIN_LOGIN` => `DOLI_ADMIN_LOGIN_FILE` +* `DOLI_ADMIN_PASSWORD` => `DOLI_ADMIN_PASSWORD_FILE` +* `DOLI_CRON_KEY` => `DOLI_CRON_KEY_FILE` +* `DOLI_CRON_USER` => `DOLI_CRON_USER_FILE` diff --git a/docker-run.sh b/docker-run.sh index 427bb06..b682b0d 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -228,6 +228,8 @@ DOLI_DB_USER=$(get_env_value 'DOLI_DB_USER' 'doli') DOLI_DB_PASSWORD=$(get_env_value 'DOLI_DB_PASSWORD' 'doli_pass') DOLI_ADMIN_LOGIN=$(get_env_value 'DOLI_ADMIN_LOGIN' 'admin') DOLI_ADMIN_PASSWORD=$(get_env_value 'DOLI_ADMIN_PASSWORD' 'admin') +DOLI_CRON_KEY=$(get_env_value 'DOLI_CRON_KEY' '') +DOLI_CRON_USER=$(get_env_value 'DOLI_CRON_USER' '') run diff --git a/images/11.0.5-php7.4/docker-run.sh b/images/11.0.5-php7.4/docker-run.sh index 427bb06..b682b0d 100755 --- a/images/11.0.5-php7.4/docker-run.sh +++ b/images/11.0.5-php7.4/docker-run.sh @@ -228,6 +228,8 @@ DOLI_DB_USER=$(get_env_value 'DOLI_DB_USER' 'doli') DOLI_DB_PASSWORD=$(get_env_value 'DOLI_DB_PASSWORD' 'doli_pass') DOLI_ADMIN_LOGIN=$(get_env_value 'DOLI_ADMIN_LOGIN' 'admin') DOLI_ADMIN_PASSWORD=$(get_env_value 'DOLI_ADMIN_PASSWORD' 'admin') +DOLI_CRON_KEY=$(get_env_value 'DOLI_CRON_KEY' '') +DOLI_CRON_USER=$(get_env_value 'DOLI_CRON_USER' '') run diff --git a/images/12.0.5-php7.4/docker-run.sh b/images/12.0.5-php7.4/docker-run.sh index 427bb06..b682b0d 100755 --- a/images/12.0.5-php7.4/docker-run.sh +++ b/images/12.0.5-php7.4/docker-run.sh @@ -228,6 +228,8 @@ DOLI_DB_USER=$(get_env_value 'DOLI_DB_USER' 'doli') DOLI_DB_PASSWORD=$(get_env_value 'DOLI_DB_PASSWORD' 'doli_pass') DOLI_ADMIN_LOGIN=$(get_env_value 'DOLI_ADMIN_LOGIN' 'admin') DOLI_ADMIN_PASSWORD=$(get_env_value 'DOLI_ADMIN_PASSWORD' 'admin') +DOLI_CRON_KEY=$(get_env_value 'DOLI_CRON_KEY' '') +DOLI_CRON_USER=$(get_env_value 'DOLI_CRON_USER' '') run diff --git a/images/13.0.4-php7.4/docker-run.sh b/images/13.0.4-php7.4/docker-run.sh index 427bb06..b682b0d 100755 --- a/images/13.0.4-php7.4/docker-run.sh +++ b/images/13.0.4-php7.4/docker-run.sh @@ -228,6 +228,8 @@ DOLI_DB_USER=$(get_env_value 'DOLI_DB_USER' 'doli') DOLI_DB_PASSWORD=$(get_env_value 'DOLI_DB_PASSWORD' 'doli_pass') DOLI_ADMIN_LOGIN=$(get_env_value 'DOLI_ADMIN_LOGIN' 'admin') DOLI_ADMIN_PASSWORD=$(get_env_value 'DOLI_ADMIN_PASSWORD' 'admin') +DOLI_CRON_KEY=$(get_env_value 'DOLI_CRON_KEY' '') +DOLI_CRON_USER=$(get_env_value 'DOLI_CRON_USER' '') run diff --git a/images/14.0.5-php7.4/docker-run.sh b/images/14.0.5-php7.4/docker-run.sh index 427bb06..b682b0d 100755 --- a/images/14.0.5-php7.4/docker-run.sh +++ b/images/14.0.5-php7.4/docker-run.sh @@ -228,6 +228,8 @@ DOLI_DB_USER=$(get_env_value 'DOLI_DB_USER' 'doli') DOLI_DB_PASSWORD=$(get_env_value 'DOLI_DB_PASSWORD' 'doli_pass') DOLI_ADMIN_LOGIN=$(get_env_value 'DOLI_ADMIN_LOGIN' 'admin') DOLI_ADMIN_PASSWORD=$(get_env_value 'DOLI_ADMIN_PASSWORD' 'admin') +DOLI_CRON_KEY=$(get_env_value 'DOLI_CRON_KEY' '') +DOLI_CRON_USER=$(get_env_value 'DOLI_CRON_USER' '') run diff --git a/images/15.0.3-php7.4/docker-run.sh b/images/15.0.3-php7.4/docker-run.sh index 427bb06..b682b0d 100755 --- a/images/15.0.3-php7.4/docker-run.sh +++ b/images/15.0.3-php7.4/docker-run.sh @@ -228,6 +228,8 @@ DOLI_DB_USER=$(get_env_value 'DOLI_DB_USER' 'doli') DOLI_DB_PASSWORD=$(get_env_value 'DOLI_DB_PASSWORD' 'doli_pass') DOLI_ADMIN_LOGIN=$(get_env_value 'DOLI_ADMIN_LOGIN' 'admin') DOLI_ADMIN_PASSWORD=$(get_env_value 'DOLI_ADMIN_PASSWORD' 'admin') +DOLI_CRON_KEY=$(get_env_value 'DOLI_CRON_KEY' '') +DOLI_CRON_USER=$(get_env_value 'DOLI_CRON_USER' '') run diff --git a/images/16.0.5-php8.1/docker-run.sh b/images/16.0.5-php8.1/docker-run.sh index 427bb06..b682b0d 100755 --- a/images/16.0.5-php8.1/docker-run.sh +++ b/images/16.0.5-php8.1/docker-run.sh @@ -228,6 +228,8 @@ DOLI_DB_USER=$(get_env_value 'DOLI_DB_USER' 'doli') DOLI_DB_PASSWORD=$(get_env_value 'DOLI_DB_PASSWORD' 'doli_pass') DOLI_ADMIN_LOGIN=$(get_env_value 'DOLI_ADMIN_LOGIN' 'admin') DOLI_ADMIN_PASSWORD=$(get_env_value 'DOLI_ADMIN_PASSWORD' 'admin') +DOLI_CRON_KEY=$(get_env_value 'DOLI_CRON_KEY' '') +DOLI_CRON_USER=$(get_env_value 'DOLI_CRON_USER' '') run diff --git a/images/17.0.1-php8.1/docker-run.sh b/images/17.0.1-php8.1/docker-run.sh index 427bb06..b682b0d 100755 --- a/images/17.0.1-php8.1/docker-run.sh +++ b/images/17.0.1-php8.1/docker-run.sh @@ -228,6 +228,8 @@ DOLI_DB_USER=$(get_env_value 'DOLI_DB_USER' 'doli') DOLI_DB_PASSWORD=$(get_env_value 'DOLI_DB_PASSWORD' 'doli_pass') DOLI_ADMIN_LOGIN=$(get_env_value 'DOLI_ADMIN_LOGIN' 'admin') DOLI_ADMIN_PASSWORD=$(get_env_value 'DOLI_ADMIN_PASSWORD' 'admin') +DOLI_CRON_KEY=$(get_env_value 'DOLI_CRON_KEY' '') +DOLI_CRON_USER=$(get_env_value 'DOLI_CRON_USER' '') run diff --git a/images/develop/docker-run.sh b/images/develop/docker-run.sh index 427bb06..b682b0d 100755 --- a/images/develop/docker-run.sh +++ b/images/develop/docker-run.sh @@ -228,6 +228,8 @@ DOLI_DB_USER=$(get_env_value 'DOLI_DB_USER' 'doli') DOLI_DB_PASSWORD=$(get_env_value 'DOLI_DB_PASSWORD' 'doli_pass') DOLI_ADMIN_LOGIN=$(get_env_value 'DOLI_ADMIN_LOGIN' 'admin') DOLI_ADMIN_PASSWORD=$(get_env_value 'DOLI_ADMIN_PASSWORD' 'admin') +DOLI_CRON_KEY=$(get_env_value 'DOLI_CRON_KEY' '') +DOLI_CRON_USER=$(get_env_value 'DOLI_CRON_USER' '') run