From e064feafffa5fb75745c30381a64bfa2b4b8b153 Mon Sep 17 00:00:00 2001 From: paspo Date: Tue, 26 Nov 2019 13:26:00 +0100 Subject: [PATCH] added mariadb 10.4 --- .drone.yml | 26 ++++++++++++++++++++++++-- Dockerfile | 2 +- README.md | 4 ++-- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 39bfe0c..5f81b4a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -66,6 +66,28 @@ steps: dockerfile: Dockerfile build_args: - MARIA_VERSION=10.3 + auto_tag: false + force_tag: true + daemon_off: false + password: + from_secret: docker_password + registry: docker.asperti.com + repo: docker.asperti.com/paspo/mariadb-backup-slave + tags: + - maria-10.3 + username: + from_secret: docker_username + when: + event: + - tag + + - name: build_and_publish_10_4 + image: plugins/docker:linux-amd64 + pull: always + settings: + dockerfile: Dockerfile + build_args: + - MARIA_VERSION=10.4 auto_tag: true force_tag: true daemon_off: false @@ -75,9 +97,9 @@ steps: repo: docker.asperti.com/paspo/mariadb-backup-slave tags: - latest - - maria-10.3 + - maria-10.4 username: from_secret: docker_username when: event: - - tag + - tag \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 47d964a..1d6a8f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG MARIA_VERSION=10.3 +ARG MARIA_VERSION=10.4 FROM mariadb:${MARIA_VERSION} RUN apt-get update && \ diff --git a/README.md b/README.md index 77da6fd..b3bbe78 100644 --- a/README.md +++ b/README.md @@ -219,8 +219,8 @@ docker-compose up -d ``` ## How to use different mariadb version -The default is mariadb 10.3. -If you want, you can use mariadb 10.2 or 10.1 by changing this line in **docker-compose.yaml**: +The default is mariadb 10.4. +If you want, you can use mariadb 10.3, 10.2 or 10.1 by changing this line in **docker-compose.yaml**: ``` image: docker.asperti.com/paspo/mariadb-backup-slave:maria-10.1 ``` \ No newline at end of file