From 818506512dea08ab5c2570e29b35619d8391b921 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Sat, 28 Jul 2018 21:13:15 +0200 Subject: [PATCH 1/2] [twgit] Init release 'release-10.3.8'. From 80612d842e2e8a6965a9fce4f1002b4f361b098e Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Sat, 28 Jul 2018 21:27:45 +0200 Subject: [PATCH 2/2] MariaDB 10.3.8 --- CHANGELOG.md | 6 ++++++ Makefile | 2 +- image/Dockerfile | 7 +++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6e56b9..694a478 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 \ No newline at end of file diff --git a/Makefile b/Makefile index dc54b78..b700540 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/image/Dockerfile b/image/Dockerfile index 452291d..0b5fcc3 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -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 # 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 \ @@ -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 \