Skip to content

Commit

Permalink
Merge branch 'release-10.3.8' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
BertrandGouny committed Jul 28, 2018
2 parents ae0456d + 80612d8 commit e8220ef
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,11 @@ 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.8] - 2017-07-28
### Changed
- Upgrade MariaDB version to 10.3.8

## 10.2.14 - 2018-04-13
Initial release

[10.3.8]: https://github.com/osixia/docker-mariadb/compare/v10.2.14...v10.3.8
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
NAME = osixia/mariadb-helper
VERSION = 10.2.14
VERSION = 10.3.8

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

Expand Down
7 changes: 3 additions & 4 deletions image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# Use osixia/light-baseimage
# sources: https://github.com/osixia/docker-light-baseimage
FROM osixia/light-baseimage:1.1.1
MAINTAINER Bertrand Gouny <[email protected]>

# MariaDB version
ARG MARIADB_MAJOR=10.2
ARG MARIADB_VERSION=10.2.14+maria~stretch
ARG MARIADB_MAJOR=10.3
ARG MARIADB_VERSION=1:10.3.8+maria~stretch

# Add MariaDB repository
RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 \
Expand All @@ -21,7 +20,7 @@ RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8
# sources: https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/add-multiple-process-stack
# https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/add-service-available
#  https://github.com/osixia/docker-light-baseimage/blob/stable/image/service-available/:ssl-tools/download.sh
# Install MariaDB and xtrabackup
# Install MariaDB client
RUN apt-get -y update \
&& /container/tool/add-service-available :ssl-tools \
&& LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
Expand Down

0 comments on commit e8220ef

Please sign in to comment.