From 6a7209bb6493ee57ca9d777e8678f248456d124b Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Wed, 29 May 2019 20:04:09 +0200 Subject: [PATCH 1/2] [twgit] Init release 'release-10.3.15'. From 6c6455121badf04d2b1b9dbe9224a12a45a49e79 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Wed, 29 May 2019 20:16:36 +0200 Subject: [PATCH 2/2] MariaDB 10.3.15 --- CHANGELOG.md | 5 +++++ Makefile | 2 +- README.md | 32 +++++++++++++++--------------- example/kubernetes/mariadb-rc.yaml | 2 +- image/Dockerfile | 2 +- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29329ee..18b6756 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.15] - 2019-05-29 +### Changed + - Upgrade MariaDB version to 10.3.15 + ## [10.3.14] - 2019-04-06 ### Changed - Upgrade MariaDB version to 10.3.14 @@ -182,6 +186,7 @@ and this project follows MariaDB versioning. - Upgrade baseimage to baseimage:0.9.0 - Change docker command from docker.io to docker +[10.3.15]: https://github.com/osixia/docker-mariadb/compare/v10.3.14...v10.3.15 [10.3.14]: https://github.com/osixia/docker-mariadb/compare/v10.3.13-1...v10.3.14 [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 diff --git a/Makefile b/Makefile index 35d230b..53734d2 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/mariadb -VERSION = 10.3.14 +VERSION = 10.3.15 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version diff --git a/README.md b/README.md index 1419f01..7b4f4ef 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [hub]: https://hub.docker.com/r/osixia/mariadb/ -Latest release: 10.3.14 - MariaDB 10.3.14 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/mariadb/)  +Latest release: 10.3.15 - MariaDB 10.3.15 - [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.14 - MariaDB 10.3.14 - [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.14 image](#extend-osixiamariadb10314-image) + - [Extend osixia/mariadb:10.3.15 image](#extend-osixiamariadb10315-image) - [Make your own MariaDB image](#make-your-own-mariadb-image) - [Tests](#tests) - [Kubernetes](#kubernetes) @@ -45,7 +45,7 @@ Latest release: 10.3.14 - MariaDB 10.3.14 - [Changelog](CHANGELOG.md) | [Docker ## Quick start Run MariaDB docker image: - docker run --name my-mariadb-container --detach osixia/mariadb:10.3.14 + docker run --name my-mariadb-container --detach osixia/mariadb:10.3.15 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.14 + docker run --hostname db.my-company.com --detach osixia/mariadb:10.3.15 #### 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.14 + --detach osixia/mariadb:10.3.15 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.14 + docker run --env MARIADB_SSL=false --detach osixia/mariadb:10.3.15 ### 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.14 --copy-service + docker run [your options] osixia/mariadb:10.3.15 --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.14 --loglevel debug + docker run --detach osixia/mariadb:10.3.15 --loglevel debug See all command line options: - docker run osixia/mariadb:10.3.14 --help + docker run osixia/mariadb:10.3.15 --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.14 + docker run --env MARIADB_ROOT_ALLOWED_NETWORKS="#PYTHON2BASH:['localhost','127.0.0.1','::1']" --detach osixia/mariadb:10.3.15 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.14 + docker run --env MARIADB_DATABASES="#PYTHON2BASH:[{'products': [{'user': 'password'}, {'user2': 'passw0rd'}]},'posts','tomatoes']" --detach osixia/mariadb:10.3.15 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.14 + docker run --env MARIADB_DATABASES="#PYTHON2BASH:[{'boby': 'mcD0nald'},{'billy': 'th3k1ng'},{'tomatoes': 'ketchup'}]" --detach osixia/mariadb:10.3.15 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.14 + docker run --env MARIADB_ROOT_USER="JaxTeller" --env MARIADB_ROOT_PASSWORD="Sons Of Anarchy" --detach osixia/mariadb:10.3.15 #### 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.14 + --detach osixia/mariadb:10.3.15 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.14 image +### Extend osixia/mariadb:10.3.15 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.14 + FROM osixia/mariadb:10.3.15 MAINTAINER Your Name ADD ssl-certs /container/service/mariadb/assets/certs diff --git a/example/kubernetes/mariadb-rc.yaml b/example/kubernetes/mariadb-rc.yaml index 63b8377..1a4e499 100644 --- a/example/kubernetes/mariadb-rc.yaml +++ b/example/kubernetes/mariadb-rc.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: mariadb - image: osixia/mariadb:0.2.8 + image: osixia/mariadb:10.3.15 volumeMounts: - name: mariadb-storage mountPath: /var/lib/mysql diff --git a/image/Dockerfile b/image/Dockerfile index c4d13ac..70a7d5e 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -4,7 +4,7 @@ FROM osixia/light-baseimage:1.1.2 # MariaDB version ARG MARIADB_MAJOR=10.3 -ARG MARIADB_VERSION=1:10.3.14+maria~stretch +ARG MARIADB_VERSION=1:10.3.15+maria~stretch # Add mysql user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added # https://github.com/docker-library/mariadb/blob/master/10.0/Dockerfile