Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: osixia/docker-mariadb
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v10.2.13
Choose a base ref
...
head repository: osixia/docker-mariadb
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v10.2.14
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Mar 28, 2018

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    3288670 View commit details
  2. MariaDB 10.2.14

    BertrandGouny committed Mar 28, 2018
    Copy the full SHA
    fb6c293 View commit details
  3. Copy the full SHA
    b6538f1 View commit details
Showing with 49 additions and 18 deletions.
  1. +31 −0 CHANGELOG.md
  2. +1 −1 Makefile
  3. +16 −16 README.md
  4. +1 −1 image/Dockerfile
31 changes: 31 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.2.14] - 2018-03-28
### Changed
- Upgrade MariaDB version to 10.2.14

## [10.2.13] - 2018-02-14
### Changed
- Upgrade MariaDB version to 10.2.13
@@ -144,3 +148,30 @@ and this project follows MariaDB versioning.
### Changed
- Upgrade baseimage to baseimage:0.9.0
- Change docker command from docker.io to docker

[10.2.14]: https://github.com/osixia/docker-mariadb/compare/v10.2.13...v10.2.14
[10.2.13]: https://github.com/osixia/docker-mariadb/compare/v10.2.12...v10.2.13
[10.2.12]: https://github.com/osixia/docker-mariadb/compare/v10.2.11...v10.2.12
[10.2.11]: https://github.com/osixia/docker-mariadb/compare/v10.2.10...v10.2.11
[10.2.10]: https://github.com/osixia/docker-mariadb/compare/v10.2.9...v10.2.10
[10.2.9]: https://github.com/osixia/docker-mariadb/compare/v10.2.8...v10.2.9
[10.2.8]: https://github.com/osixia/docker-mariadb/compare/v10.2.6...v10.2.8
[10.2.6]: https://github.com/osixia/docker-mariadb/compare/v10.1.23...v10.2.6
[10.1.23]: https://github.com/osixia/docker-mariadb/compare/v10.1.22...v10.1.23
[10.1.22]: https://github.com/osixia/docker-mariadb/compare/v10.1.21...v10.1.22
[10.1.21]: https://github.com/osixia/docker-mariadb/compare/v10.1.20...v10.1.21
[10.1.20]: https://github.com/osixia/docker-mariadb/compare/v10.1.19...v10.1.20
[10.1.19]: https://github.com/osixia/docker-mariadb/compare/v10.1.18...v10.1.19
[10.1.18]: https://github.com/osixia/docker-mariadb/compare/v0.2.11...v10.1.18
[0.2.11]: https://github.com/osixia/docker-mariadb/compare/v0.2.10...v0.2.11
[0.2.10]: https://github.com/osixia/docker-mariadb/compare/v0.2.9...v0.2.10
[0.2.9]: https://github.com/osixia/docker-mariadb/compare/v0.2.8...v0.2.9
[0.2.8]: https://github.com/osixia/docker-mariadb/compare/v0.2.7...v0.2.8
[0.2.7]: https://github.com/osixia/docker-mariadb/compare/v0.2.6...v0.2.7
[0.2.6]: https://github.com/osixia/docker-mariadb/compare/v0.2.5...v0.2.6
[0.2.5]: https://github.com/osixia/docker-mariadb/compare/v0.2.4...v0.2.5
[0.2.4]: https://github.com/osixia/docker-mariadb/compare/v0.2.3...v0.2.4
[0.2.3]: https://github.com/osixia/docker-mariadb/compare/v0.2.2...v0.2.3
[0.2.2]: https://github.com/osixia/docker-mariadb/compare/v0.2.1...v0.2.2
[0.2.1]: https://github.com/osixia/docker-mariadb/compare/v0.2.0...v0.2.1
[0.2.0]: https://github.com/osixia/docker-mariadb/compare/v0.1.0...v0.2.0
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
NAME = osixia/mariadb
VERSION = 10.2.13
VERSION = 10.2.14

.PHONY: build build-nocache test tag-latest push push-latest release git-tag-version

32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

[hub]: https://hub.docker.com/r/osixia/mariadb/

Latest release: 10.2.13 - MariaDB 10.2.13 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/mariadb/) 
Latest release: 10.2.14 - MariaDB 10.2.14 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/mariadb/) 

**A docker image to run MariaDB with XtraBackup.**
> [MariaDB](https://mariadb.org/)
@@ -33,7 +33,7 @@ Latest release: 10.2.13 - MariaDB 10.2.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.2.13 image](#extend-osixiamariadb10213-image)
- [Extend osixia/mariadb:10.2.14 image](#extend-osixiamariadb10214-image)
- [Make your own MariaDB image](#make-your-own-mariadb-image)
- [Tests](#tests)
- [Kubernetes](#kubernetes)
@@ -44,7 +44,7 @@ Latest release: 10.2.13 - MariaDB 10.2.13 - [Changelog](CHANGELOG.md) | [Docker
## Quick start
Run MariaDB docker image:

docker run --name my-mariadb-container --detach osixia/mariadb:10.2.13
docker run --name my-mariadb-container --detach osixia/mariadb:10.2.14

This start a new container with a MariaDB server running inside.

@@ -134,7 +134,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.2.13
docker run --hostname db.my-company.com --detach osixia/mariadb:10.2.14

#### Use your own certificate

@@ -144,22 +144,22 @@ 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.2.13
--detach osixia/mariadb:10.2.14

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.2.13
docker run --env MARIADB_SSL=false --detach osixia/mariadb:10.2.14

### Fix docker mounted file problems

You may have some problems with mounted files on some systems. The startup script try to make some file adjustment and fix files owner and permissions, this can result in multiple errors. See [Docker documentation](https://docs.docker.com/v1.4/userguide/dockervolumes/#mount-a-host-file-as-a-data-volume).

To fix that run the container with `--copy-service` argument :

docker run [your options] osixia/mariadb:10.2.13 --copy-service
docker run [your options] osixia/mariadb:10.2.14 --copy-service


### Debug
@@ -169,11 +169,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.2.13 --loglevel debug
docker run --detach osixia/mariadb:10.2.14 --loglevel debug

See all command line options:

docker run osixia/mariadb:10.2.13 --help
docker run osixia/mariadb:10.2.14 --help


## Environment Variables
@@ -193,7 +193,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.2.13
docker run --env MARIADB_ROOT_ALLOWED_NETWORKS="#PYTHON2BASH:['localhost','127.0.0.1','::1']" --detach osixia/mariadb:10.2.14

To convert yaml to python online: http://yaml-online-parser.appspot.com/

@@ -209,7 +209,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.2.13
docker run --env MARIADB_DATABASES="#PYTHON2BASH:[{'products': [{'user': 'password'}, {'user2': 'passw0rd'}]},'posts','tomatoes']" --detach osixia/mariadb:10.2.14

To convert yaml to python online: http://yaml-online-parser.appspot.com/

@@ -223,7 +223,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.2.13
docker run --env MARIADB_DATABASES="#PYTHON2BASH:[{'boby': 'mcD0nald'},{'billy': 'th3k1ng'},{'tomatoes': 'ketchup'}]" --detach osixia/mariadb:10.2.14

To convert yaml to python online: http://yaml-online-parser.appspot.com/

@@ -254,14 +254,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.2.13
docker run --env MARIADB_ROOT_USER="JaxTeller" --env MARIADB_ROOT_PASSWORD="Sons Of Anarchy" --detach osixia/mariadb:10.2.14

#### 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.2.13
--detach osixia/mariadb:10.2.14

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).

@@ -271,13 +271,13 @@ This is the best solution if you have a private registry. Please refer to the [A

## Advanced User Guide

### Extend osixia/mariadb:10.2.13 image
### Extend osixia/mariadb:10.2.14 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.2.13
FROM osixia/mariadb:10.2.14
MAINTAINER Your Name <your@name.com>

ADD ssl-certs /container/service/mariadb/assets/certs
2 changes: 1 addition & 1 deletion image/Dockerfile
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>

# MariaDB version
ARG MARIADB_MAJOR=10.2
ARG MARIADB_VERSION=10.2.13+maria~stretch
ARG MARIADB_VERSION=10.2.14+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