From 07cbca47292993a3357de9d1eeaf7bf6bfc177e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Aur=C3=A8le=20Brothier?= Date: Mon, 15 Oct 2018 10:33:46 +0200 Subject: [PATCH 1/4] docker: add compose file for database --- tools/docker/docker-compose.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 tools/docker/docker-compose.yml diff --git a/tools/docker/docker-compose.yml b/tools/docker/docker-compose.yml new file mode 100644 index 000000000000..43cfef1eb822 --- /dev/null +++ b/tools/docker/docker-compose.yml @@ -0,0 +1,17 @@ +version: '2' +services: + db: + image: mariadb:10.0 + volumes: + - db:/var/lib/mysql + environment: + MYSQL_DATABASE: cloud +# MYSQL_ROOT_PASSWORD: root + MYSQL_ALLOW_EMPTY_PASSWORD: 1 + MYSQL_USER: cloud + MYSQL_PASSWORD: cloud + ports: + - "3306:3306" + +volumes: + db: From 42ff952a399832751b4310aaf1637b195733585c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Aur=C3=A8le=20Brothier?= Date: Sat, 27 Oct 2018 22:02:41 +0200 Subject: [PATCH 2/4] docker: add license header --- tools/docker/docker-compose.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tools/docker/docker-compose.yml b/tools/docker/docker-compose.yml index 43cfef1eb822..1a579e12482b 100644 --- a/tools/docker/docker-compose.yml +++ b/tools/docker/docker-compose.yml @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + version: '2' services: db: From b8ce21f81c72818ee34ffd361e0f8beb938cc0c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Aur=C3=A8le=20Brothier?= Date: Sat, 27 Oct 2018 22:48:29 +0200 Subject: [PATCH 3/4] docker: add custom configuration for database --- tools/docker/docker-compose.yml | 1 + tools/docker/mariadb-docker/cloudstack-docker.cnf | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 tools/docker/mariadb-docker/cloudstack-docker.cnf diff --git a/tools/docker/docker-compose.yml b/tools/docker/docker-compose.yml index 1a579e12482b..86934f6407f1 100644 --- a/tools/docker/docker-compose.yml +++ b/tools/docker/docker-compose.yml @@ -20,6 +20,7 @@ services: db: image: mariadb:10.0 volumes: + - ./mariadb-docker:/etc/mysql/conf.d - db:/var/lib/mysql environment: MYSQL_DATABASE: cloud diff --git a/tools/docker/mariadb-docker/cloudstack-docker.cnf b/tools/docker/mariadb-docker/cloudstack-docker.cnf new file mode 100644 index 000000000000..b92b8b1efbac --- /dev/null +++ b/tools/docker/mariadb-docker/cloudstack-docker.cnf @@ -0,0 +1,7 @@ +[mysqld] +server-id=master-dev +innodb_rollback_on_timeout=1 +innodb_lock_wait_timeout=600 +max_connections=1000 +log-bin=mysql-bin +binlog-format = 'ROW' From 6e2d0e323361f0acef0d9875efbeb7c798417bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Aur=C3=A8le=20Brothier?= Date: Sat, 27 Oct 2018 23:04:04 +0200 Subject: [PATCH 4/4] famous license --- .../docker/mariadb-docker/cloudstack-docker.cnf | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tools/docker/mariadb-docker/cloudstack-docker.cnf b/tools/docker/mariadb-docker/cloudstack-docker.cnf index b92b8b1efbac..771aa8620447 100644 --- a/tools/docker/mariadb-docker/cloudstack-docker.cnf +++ b/tools/docker/mariadb-docker/cloudstack-docker.cnf @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + [mysqld] server-id=master-dev innodb_rollback_on_timeout=1