From 19eb7209ee5932e5af741e21cd6b8ab02f96a8b6 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Fri, 19 Jun 2020 12:01:27 +0000 Subject: [PATCH] database stuff --- .gitignore | 1 + auditdb.sql | 13 +++++++++++++ startBuildEnv.sh | 22 ++++++++++++++++++++-- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 auditdb.sql diff --git a/.gitignore b/.gitignore index 42e68cb..40c1711 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ mqttauditing tests paho +mariadb-data diff --git a/auditdb.sql b/auditdb.sql new file mode 100644 index 0000000..c8ff80b --- /dev/null +++ b/auditdb.sql @@ -0,0 +1,13 @@ +create database auditdb; +create user 'auditadder'@'%' identified by 'test123'; +grant insert on auditdb.* to 'auditadder'@'%'; + +use auditdb; + +CREATE TABLE audittrail ( + id int(11) NOT NULL AUTO_INCREMENT, + ts timestamp NOT NULL DEFAULT current_timestamp(), + topic varchar(1024) NOT NULL, + payload varchar(4096) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=1437058 DEFAULT CHARSET=latin1 diff --git a/startBuildEnv.sh b/startBuildEnv.sh index d6e8926..220cc49 100755 --- a/startBuildEnv.sh +++ b/startBuildEnv.sh @@ -4,15 +4,26 @@ IMAGE=registry.hottis.de/dockerized/c-build-env:latest OPT_BROKER="" +OPT_MARIADB="" OPT_ROOT="" -while getopts bphr flag +while getopts mbphrc flag do case "${flag}" in b) echo "Start broker"; docker run -d --rm --name broker -p 1883:1883 eclipse-mosquitto; OPT_BROKER="--link broker"; ;; + m) echo "Start MariaDB"; + MARIADB_DATA_DIR=$PWD/mariadb-data + [ -d $MARIADB_DATA_DIR ] || mkdir -p $MARIADB_DATA_DIR + docker run -d --rm --name mariadb -v $PWD:/mnt -v $MARIADB_DATA_DIR:/var/lib/mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=geheim123 mariadb; + OPT_MARIADB="--link mariadb"; + ;; + c) echo "Create database"; + docker exec -it mariadb mysql -u root --password=geheim123 -e "source /mnt/auditdb.sql" mysql + exit 0; + ;; p) echo "Pull environment image"; docker pull $IMAGE; ;; @@ -21,6 +32,8 @@ do ;; h) echo "Usage:"; echo "-b: Start broker"; + echo "-m: Start MariaDB"; + echo -"c: Create the database"; echo "-p: Pull new environment image"; echo "-r: Run environment as root"; echo "-h: This help"; @@ -30,10 +43,15 @@ do done -docker run -it --rm $OPT_BROKER $OPT_ROOT -v $PWD:/work $IMAGE bash +docker run -it --rm $OPT_BROKER $OPT_MARIADB $OPT_ROOT -v $PWD:/work $IMAGE bash if [ "$OPT_BROKER" != "" ]; then echo "Stopping broker" docker stop broker fi +if [ "$OPT_MARIADB" != "" ]; then + echo "Stopping MariaDB" + docker stop mariadb +fi +