From 8b811b39a8b718d1d15b15a8e606f907aa688619 Mon Sep 17 00:00:00 2001 From: Chris Friesen Date: Wed, 23 Jan 2019 17:36:13 -0500 Subject: [PATCH] build mariadb docker image with galera arbitrator added In order to support running the galera arbitrator we need to add it to the openstack-helm mariadb docker image. This means building our own docker image for now. I've talked with "jayahn" on the openstack-helm IRC channel, and they said they had no objection to adding galera-arbitrator to their mariadb image, so we should upstream it as soon as possible. Once it's upstreamed we can remove this. Change-Id: I6ab2607abcd8e0d130ef80fbd1979c62a20a6ff4 Story: 2004712 Task: 29053 Signed-off-by: Chris Friesen --- centos_master_docker_images.inc | 1 + centos_pike_docker_images.inc | 1 + database/mariadb/centos/docker/Dockerfile | 6 ++++++ database/mariadb/centos/stx-mariadb.master_docker_image | 3 +++ database/mariadb/centos/stx-mariadb.pike_docker_image | 3 +++ 5 files changed, 14 insertions(+) create mode 100644 centos_master_docker_images.inc create mode 100644 database/mariadb/centos/docker/Dockerfile create mode 100644 database/mariadb/centos/stx-mariadb.master_docker_image create mode 100644 database/mariadb/centos/stx-mariadb.pike_docker_image diff --git a/centos_master_docker_images.inc b/centos_master_docker_images.inc new file mode 100644 index 000000000..1f8a814a3 --- /dev/null +++ b/centos_master_docker_images.inc @@ -0,0 +1 @@ +database/mariadb diff --git a/centos_pike_docker_images.inc b/centos_pike_docker_images.inc index aae003f96..f0d9ca2ae 100644 --- a/centos_pike_docker_images.inc +++ b/centos_pike_docker_images.inc @@ -1 +1,2 @@ virt/libvirt +database/mariadb diff --git a/database/mariadb/centos/docker/Dockerfile b/database/mariadb/centos/docker/Dockerfile new file mode 100644 index 000000000..1735f8669 --- /dev/null +++ b/database/mariadb/centos/docker/Dockerfile @@ -0,0 +1,6 @@ +FROM openstackhelm/mariadb:10.2.18 + +RUN apt-get update && apt-get install -y galera-arbitrator-3 + +CMD ["/usr/bin/garbd"] + diff --git a/database/mariadb/centos/stx-mariadb.master_docker_image b/database/mariadb/centos/stx-mariadb.master_docker_image new file mode 100644 index 000000000..5c5134b03 --- /dev/null +++ b/database/mariadb/centos/stx-mariadb.master_docker_image @@ -0,0 +1,3 @@ +BUILDER=docker +LABEL=stx-mariadb + diff --git a/database/mariadb/centos/stx-mariadb.pike_docker_image b/database/mariadb/centos/stx-mariadb.pike_docker_image new file mode 100644 index 000000000..5c5134b03 --- /dev/null +++ b/database/mariadb/centos/stx-mariadb.pike_docker_image @@ -0,0 +1,3 @@ +BUILDER=docker +LABEL=stx-mariadb +