diff --git a/CHANGELOG.md b/CHANGELOG.md index 5912072..b443806 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 3.5.3 2023-04-14 + + ### Changed + - Revert 3.5.2 and start doing 5 character checks on ADMIN_USER + - Fix a problem with CRON_INTERVAL not being used + + ## 3.5.2 2023-04-14 ### Added diff --git a/README.md b/README.md index ab4454e..5ca3637 100644 --- a/README.md +++ b/README.md @@ -63,11 +63,11 @@ Builds of the image are available on [Docker Hub](https://hub.docker.com/r/tired docker pull docker.io/tiredofdit/osticket:(imagetag) ``` -Builds of the image are also available on the [Github Container Registry](https://github.com/tiredofit/docker-osticket/pkgs/container/docker-osticket) - +Builds of the image are also available on the [Github Container Registry](https://github.com/tiredofit/docker-osticket/pkgs/container/docker-osticket) + ``` docker pull ghcr.io/tiredofit/docker-osticket:(imagetag) -``` +``` The following image tags are available along with their tagged release based on what's written in the [Changelog](CHANGELOG.md): @@ -120,9 +120,9 @@ Be sure to view the following repositories to understand all the customizable op | `ADMIN_FIRSTNAME` | First name of Admin User | | | `ADMIN_LASTNAME` | Last name of Admin User | | | `ADMIN_EMAIL` | Admin Email address (Make sure it is different than INSTALL_EMAIL) | | -| `ADMIN_USER` | Admin Username | | -| `ADMIN_PASS` | Admin Password *Must be more than 5 characters* | | -| `CRON_PERIOD` | Amount of time in Minutes to Check Incoming Mail | `10` | +| `ADMIN_USER` | Admin Username *Must be more than 5 characters* | | +| `ADMIN_PASS` | Admin Password | | +| `CRON_INTERVAL` | Amount of time in Minutes to Check Incoming Mail | `10` | | `DB_HOST` | Host or container name of MariaDB Server e.g. `osticket-db` | | | `DB_PORT` | MariaDB Port | `3306` | | `DB_NAME` | MariaDB Database name e.g. `osticket` | | diff --git a/install/assets/cron/osticket.txt b/install/assets/cron/osticket.txt index ada2a27..4cb7e19 100644 --- a/install/assets/cron/osticket.txt +++ b/install/assets/cron/osticket.txt @@ -1 +1 @@ -*/ * * * * TZ=${TIMEZONE} php -q ${NGINX_WEBROOT}/api/cron.php >/dev/null 2>&1 +*/ * * * * TZ=${TIMEZONE} php -q ${NGINX_WEBROOT}/api/cron.php >/dev/null 2>&1 diff --git a/install/etc/cont-init.d/30-osticket b/install/etc/cont-init.d/30-osticket index 396214c..d8615fc 100755 --- a/install/etc/cont-init.d/30-osticket +++ b/install/etc/cont-init.d/30-osticket @@ -9,18 +9,24 @@ check_service_initialized init 20-php-fpm ### Sanity Test sanity_db sanity_var ADMIN_PASS "Admin Password" -if [ "$(wc -c "${ADMIN_PASS}")" -le 5 ] ; then - print_error "Admin passwords need to be 5 characters or greater. Exiting.." - exit 5 -fi sanity_var ADMIN_EMAIL "Admin Email" sanity_var ADMIN_USER "Admin Username" +if [ "$(wc -c "${ADMIN_USER}")" -le 5 ] ; then + print_error "Admin user need to be 5 characters or greater. Exiting.." + exit 5 +fi + sanity_var INSTALL_SECRET "Install Secret" db_ready mariadb +# Bugfix ~ 3.5.3 +if [ -n "${CRON_PERIOD}" ] ; then + CRON_INTERVAL=${CRON_PERIOD} +fi + ### Adjust Runtime Variables -sed -i "s##${CRON_PERIOD}/g" /assets/cron/osticket.txt +sed -i "s##${CRON_INTERVAL}/g" /assets/cron/osticket.txt sed -i "s##${NGINX_WEBROOT}#g" /assets/setup/install.php ### Check to see if this is a new install, if yes copy information from assets create directories...