From 1197959dd98aaac618a6e16708d84af012bbecaf Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Fri, 22 Mar 2019 10:45:32 +0100 Subject: [PATCH] make cron log with /usr/bin/logger --- CHANGELOG.md | 5 +++ Makefile | 2 +- README.md | 32 ++++++++++---------- image/service/mariadb-backup/assets/cronjobs | 2 +- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3782d40..15fde60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project follows MariaDB versioning. +## [10.3.13-1] - 2019-03-22 +### Fixed + - Cron log with /usr/bin/logger + ## [10.3.13] - 2019-03-21 ### Changed - Upgrade MariaDB version to 10.3.13 @@ -174,6 +178,7 @@ and this project follows MariaDB versioning. - Upgrade baseimage to baseimage:0.9.0 - Change docker command from docker.io to docker +[10.3.13-1]: https://github.com/osixia/docker-mariadb/compare/v10.3.13...v10.3.13-1 [10.3.13]: https://github.com/osixia/docker-mariadb/compare/v10.3.12...v10.3.13 [10.3.12]: https://github.com/osixia/docker-mariadb/compare/v10.3.10...v10.3.12 [10.3.10]: https://github.com/osixia/docker-mariadb/compare/v10.3.8...v10.3.10 diff --git a/Makefile b/Makefile index eeeb8b0..c0043b6 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/mariadb -VERSION = 10.3.13 +VERSION = 10.3.13-1 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version diff --git a/README.md b/README.md index ee5d7d4..e0e16d5 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [hub]: https://hub.docker.com/r/osixia/mariadb/ -Latest release: 10.3.13 - MariaDB 10.3.13 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/mariadb/)  +Latest release: 10.3.13-1 - MariaDB 10.3.13 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/mariadb/)  **A docker image to run MariaDB with perdiodic backups.** > [MariaDB](https://mariadb.org/) @@ -34,7 +34,7 @@ Latest release: 10.3.13 - MariaDB 10.3.13 - [Changelog](CHANGELOG.md) | [Docker - [Link environment file](#link-environment-file) - [Make your own image or extend this image](#make-your-own-image-or-extend-this-image) - [Advanced User Guide](#advanced-user-guide) - - [Extend osixia/mariadb:10.3.13 image](#extend-osixiamariadb10313-image) + - [Extend osixia/mariadb:10.3.13-1 image](#extend-osixiamariadb10313-1-image) - [Make your own MariaDB image](#make-your-own-mariadb-image) - [Tests](#tests) - [Kubernetes](#kubernetes) @@ -45,7 +45,7 @@ Latest release: 10.3.13 - MariaDB 10.3.13 - [Changelog](CHANGELOG.md) | [Docker ## Quick start Run MariaDB docker image: - docker run --name my-mariadb-container --detach osixia/mariadb:10.3.13 + docker run --name my-mariadb-container --detach osixia/mariadb:10.3.13-1 This start a new container with a MariaDB server running inside. @@ -135,7 +135,7 @@ Or you can set your custom config at run time, by mounting your **my.cnf** file #### Use autogenerated certificate By default SSL is enable, a certificate is created with the container hostname (it can be set by docker run --hostname option eg: db.my-company.com). - docker run --hostname db.my-company.com --detach osixia/mariadb:10.3.13 + docker run --hostname db.my-company.com --detach osixia/mariadb:10.3.13-1 #### Use your own certificate @@ -145,14 +145,14 @@ You can set your custom certificate at run time, by mounting a directory contain --env MARIADB_SSL_CRT_FILENAME=my-cert.crt \ --env MARIADB_SSL_KEY_FILENAME=my-cert.key \ --env MARIADB_SSL_CA_CRT_FILENAME=the-ca.crt \ - --detach osixia/mariadb:10.3.13 + --detach osixia/mariadb:10.3.13-1 Other solutions are available please refer to the [Advanced User Guide](#advanced-user-guide) #### Disable SSL Add --env MARIADB_SSL=false to the run command : - docker run --env MARIADB_SSL=false --detach osixia/mariadb:10.3.13 + docker run --env MARIADB_SSL=false --detach osixia/mariadb:10.3.13-1 ### Fix docker mounted file problems @@ -160,7 +160,7 @@ You may have some problems with mounted files on some systems. The startup scrip To fix that run the container with `--copy-service` argument : - docker run [your options] osixia/mariadb:10.3.13 --copy-service + docker run [your options] osixia/mariadb:10.3.13-1 --copy-service ### Debug @@ -170,11 +170,11 @@ Available levels are: `none`, `error`, `warning`, `info`, `debug` and `trace`. Example command to run the container in `debug` mode: - docker run --detach osixia/mariadb:10.3.13 --loglevel debug + docker run --detach osixia/mariadb:10.3.13-1 --loglevel debug See all command line options: - docker run osixia/mariadb:10.3.13 --help + docker run osixia/mariadb:10.3.13-1 --help ## Environment Variables @@ -194,7 +194,7 @@ Used when the container is started without an existing database: ``` If you want to set this variable at docker run command add the tag `#PYTHON2BASH:` and convert the yaml in python: - docker run --env MARIADB_ROOT_ALLOWED_NETWORKS="#PYTHON2BASH:['localhost','127.0.0.1','::1']" --detach osixia/mariadb:10.3.13 + docker run --env MARIADB_ROOT_ALLOWED_NETWORKS="#PYTHON2BASH:['localhost','127.0.0.1','::1']" --detach osixia/mariadb:10.3.13-1 To convert yaml to python online: http://yaml-online-parser.appspot.com/ @@ -210,7 +210,7 @@ Used when the container is started without an existing database: ``` If you want to set this variable at docker run command add the tag `#PYTHON2BASH:` and convert the yaml in python: - docker run --env MARIADB_DATABASES="#PYTHON2BASH:[{'products': [{'user': 'password'}, {'user2': 'passw0rd'}]},'posts','tomatoes']" --detach osixia/mariadb:10.3.13 + docker run --env MARIADB_DATABASES="#PYTHON2BASH:[{'products': [{'user': 'password'}, {'user2': 'passw0rd'}]},'posts','tomatoes']" --detach osixia/mariadb:10.3.13-1 To convert yaml to python online: http://yaml-online-parser.appspot.com/ @@ -224,7 +224,7 @@ Used when the container is started without an existing database: ``` If you want to set this variable at docker run command add the tag `#PYTHON2BASH:` and convert the yaml in python: - docker run --env MARIADB_DATABASES="#PYTHON2BASH:[{'boby': 'mcD0nald'},{'billy': 'th3k1ng'},{'tomatoes': 'ketchup'}]" --detach osixia/mariadb:10.3.13 + docker run --env MARIADB_DATABASES="#PYTHON2BASH:[{'boby': 'mcD0nald'},{'billy': 'th3k1ng'},{'tomatoes': 'ketchup'}]" --detach osixia/mariadb:10.3.13-1 To convert yaml to python online: http://yaml-online-parser.appspot.com/ @@ -255,14 +255,14 @@ Other environment variables: #### Use command line argument Environment variables can be set by adding the --env argument in the command line, for example: - docker run --env MARIADB_ROOT_USER="JaxTeller" --env MARIADB_ROOT_PASSWORD="Sons Of Anarchy" --detach osixia/mariadb:10.3.13 + docker run --env MARIADB_ROOT_USER="JaxTeller" --env MARIADB_ROOT_PASSWORD="Sons Of Anarchy" --detach osixia/mariadb:10.3.13-1 #### Link environment file For example if your environment file is in : /data/environment/my-env.yaml docker run --volume /data/environment/my-env.yaml:/container/environment/01-custom/env.yaml \ - --detach osixia/mariadb:10.3.13 + --detach osixia/mariadb:10.3.13-1 Take care to link your environment file to `/container/environment/XX-somedir` (with XX < 99 so they will be processed before default environment files) and not directly to `/container/environment` because this directory contains predefined baseimage environment files to fix container environment (INITRD, LANG, LANGUAGE and LC_CTYPE). @@ -272,13 +272,13 @@ This is the best solution if you have a private registry. Please refer to the [A ## Advanced User Guide -### Extend osixia/mariadb:10.3.13 image +### Extend osixia/mariadb:10.3.13-1 image If you need to add your custom TLS certificate, bootstrap config or environment files the easiest way is to extends this image. Dockerfile example: - FROM osixia/mariadb:10.3.13 + FROM osixia/mariadb:10.3.13-1 MAINTAINER Your Name ADD ssl-certs /container/service/mariadb/assets/certs diff --git a/image/service/mariadb-backup/assets/cronjobs b/image/service/mariadb-backup/assets/cronjobs index 465de5c..1b6e2e2 100644 --- a/image/service/mariadb-backup/assets/cronjobs +++ b/image/service/mariadb-backup/assets/cronjobs @@ -1,3 +1,3 @@ # Backup -{{ MARIADB_BACKUP_CRON_EXP }} root /sbin/mariadb-backup > /proc/self/fd/1 2>/proc/self/fd/2 +{{ MARIADB_BACKUP_CRON_EXP }} root /sbin/mariadb-backup 2>&1 | /usr/bin/logger -t cron_backup # empty line