diff --git a/CHANGELOG.md b/CHANGELOG.md index 316827bf..efcf7c7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Change Log +## [1.1.2](https://github.com/pyouroboros/ouroboros/tree/1.1.2) (2019-02-02) +[Full Changelog](https://github.com/pyouroboros/ouroboros/compare/1.1.1...1.1.2) + +**Fixed bugs:** + +- No default timezone [\#176](https://github.com/pyouroboros/ouroboros/issues/176) + +**Closed issues:** + +- cron documentation example update [\#182](https://github.com/pyouroboros/ouroboros/issues/182) [[documentation](https://github.com/pyouroboros/ouroboros/labels/documentation)] + +***Other Pull Requests** +- v1.1.2 Merge [\#185](https://github.com/pyouroboros/ouroboros/pull/185) ([DirtyCajunRice](https://github.com/DirtyCajunRice)) + ## [1.1.1](https://github.com/pyouroboros/ouroboros/tree/1.1.1) (2019-02-01) [Full Changelog](https://github.com/pyouroboros/ouroboros/compare/1.1.0...1.1.1) diff --git a/Dockerfile b/Dockerfile index ad83c60a..1cda4204 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,8 @@ FROM amd64/python:3.7.2-alpine LABEL maintainers="dirtycajunrice,circa10a,tkdeviant" +ENV TZ UTC + WORKDIR /app COPY /requirements.txt /setup.py /ouroboros /README.md /app/ diff --git a/Dockerfile.arm b/Dockerfile.arm index c74da70a..d242cdb2 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -2,6 +2,8 @@ FROM arm32v6/python:3.7.2-alpine LABEL maintainers="dirtycajunrice,circa10a,tkdeviant" +ENV TZ UTC + WORKDIR /app COPY /qemu-arm-static /usr/bin/qemu-arm-static diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 37c47246..4ff6acbd 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -2,6 +2,8 @@ FROM arm64v8/python:3.7.2-alpine LABEL maintainers="dirtycajunrice,circa10a,tkdeviant" +ENV TZ UTC + WORKDIR /app COPY /qemu-aarch64-static /usr/bin/qemu-aarch64-static diff --git a/pyouroboros/config.py b/pyouroboros/config.py index aa354516..c5df05ea 100644 --- a/pyouroboros/config.py +++ b/pyouroboros/config.py @@ -6,14 +6,13 @@ class Config(object): options = ['INTERVAL', 'PROMETHEUS', 'DOCKER_SOCKETS', 'MONITOR', 'IGNORE', 'LOG_LEVEL', 'PROMETHEUS_ADDR', 'PROMETHEUS_PORT', 'NOTIFIERS', 'REPO_USER', 'REPO_PASS', 'CLEANUP', 'RUN_ONCE', 'LATEST', 'CRON', - 'TIMEZONE', 'INFLUX_URL', 'INFLUX_PORT', 'INFLUX_USERNAME', 'INFLUX_PASSWORD', 'INFLUX_DATABASE', - 'INFLUX_SSL', 'INFLUX_VERIFY_SSL', 'DATA_EXPORT', 'SELF_UPDATE', 'LABEL_ENABLE', 'DOCKER_TLS', - 'LABELS_ONLY', 'DRY_RUN', 'HOSTNAME', 'DOCKER_TLS_VERIFY'] + 'INFLUX_URL', 'INFLUX_PORT', 'INFLUX_USERNAME', 'INFLUX_PASSWORD', 'INFLUX_DATABASE', 'INFLUX_SSL', + 'INFLUX_VERIFY_SSL', 'DATA_EXPORT', 'SELF_UPDATE', 'LABEL_ENABLE', 'DOCKER_TLS', 'LABELS_ONLY', + 'DRY_RUN', 'HOSTNAME', 'DOCKER_TLS_VERIFY'] hostname = environ.get('HOSTNAME') interval = 300 cron = None - timezone = environ.get('TZ') or 'UTC' docker_sockets = 'unix://var/run/docker.sock' docker_tls = False docker_tls_verify = True diff --git a/pyouroboros/ouroboros.py b/pyouroboros/ouroboros.py index 5621472c..58ca7f3a 100644 --- a/pyouroboros/ouroboros.py +++ b/pyouroboros/ouroboros.py @@ -43,10 +43,6 @@ def main(): help='Cron formatted string for scheduling\n' 'EXAMPLE: "*/5 * * * *"') - core_group.add_argument('-z', '--timezone', default=Config.timezone, dest='TIMEZONE', - help='Timezone for scheduling\n' - 'EXAMPLE: "America/Chicago"') - core_group.add_argument('-l', '--log-level', choices=['debug', 'info', 'warn', 'error', 'critical'], dest='LOG_LEVEL', default=Config.log_level, help='Set logging level\n' 'DEFAULT: info') @@ -149,7 +145,7 @@ def main(): data_manager = DataManager(config) notification_manager = NotificationManager(config, data_manager) - scheduler = BackgroundScheduler(timezone=config.timezone) + scheduler = BackgroundScheduler() scheduler.start() for socket in config.docker_sockets: