added mariadb 10.4
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/tag Build is passing Details

This commit is contained in:
Paolo Asperti 2019-11-26 13:26:00 +01:00
parent c70c7597be
commit e064feafff
Signed by: paspo
GPG Key ID: 06D46905D19D5182
3 changed files with 27 additions and 5 deletions

View File

@ -66,6 +66,28 @@ steps:
dockerfile: Dockerfile dockerfile: Dockerfile
build_args: build_args:
- MARIA_VERSION=10.3 - 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 auto_tag: true
force_tag: true force_tag: true
daemon_off: false daemon_off: false
@ -75,9 +97,9 @@ steps:
repo: docker.asperti.com/paspo/mariadb-backup-slave repo: docker.asperti.com/paspo/mariadb-backup-slave
tags: tags:
- latest - latest
- maria-10.3 - maria-10.4
username: username:
from_secret: docker_username from_secret: docker_username
when: when:
event: event:
- tag - tag

View File

@ -1,4 +1,4 @@
ARG MARIA_VERSION=10.3 ARG MARIA_VERSION=10.4
FROM mariadb:${MARIA_VERSION} FROM mariadb:${MARIA_VERSION}
RUN apt-get update && \ RUN apt-get update && \

View File

@ -219,8 +219,8 @@ docker-compose up -d
``` ```
## How to use different mariadb version ## How to use different mariadb version
The default is mariadb 10.3. The default is mariadb 10.4.
If you want, you can use mariadb 10.2 or 10.1 by changing this line in **docker-compose.yaml**: 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 image: docker.asperti.com/paspo/mariadb-backup-slave:maria-10.1
``` ```