From b87fc7701c4dab71fddbe4c6659002f1bffa916b Mon Sep 17 00:00:00 2001
From: Dariusz Janny <janny@man.poznan.pl>
Date: Wed, 16 Dec 2020 12:48:19 +0100
Subject: [PATCH] [#1] mariadb used in docker image
---
Dockerfile | 1 +
README.md | 22 ++++++++++++++++++++++
conf/faas-db.cnf | 6 ++++++
conf/faas-db.compose.yml | 15 +++++++++++++++
docker/Dockerfile | 1 -
scripts/build.sh | 3 +++
scripts/faas-mysql.build | 3 ---
scripts/run.sh | 3 +++
8 files changed, 50 insertions(+), 4 deletions(-)
create mode 100644 Dockerfile
create mode 100644 conf/faas-db.cnf
create mode 100644 conf/faas-db.compose.yml
delete mode 100644 docker/Dockerfile
create mode 100755 scripts/build.sh
delete mode 100755 scripts/faas-mysql.build
create mode 100755 scripts/run.sh
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..4de8215
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1 @@
+FROM mariadb:10.5.8
diff --git a/README.md b/README.md
index 5cd101a..9860bab 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,23 @@
# FaaS-DB
+
+## structure
+`_conf/`_ - directory with configuration files
+`scripts/` - directory with utils and scripts
+
+## build image
+To build `faas-db` docker image
+`
+cd scripts
+./build.sh
+`
+
+
+## run image
+To run `faas-db` docker image
+`
+cd scripts
+./run.sh
+`
+
+
+
diff --git a/conf/faas-db.cnf b/conf/faas-db.cnf
new file mode 100644
index 0000000..ab58617
--- /dev/null
+++ b/conf/faas-db.cnf
@@ -0,0 +1,6 @@
+FAAS_DB_IMAGE=faas/faas-db:1.0-SNAPSHOT
+FAAS_DB_VOLUME_VAR_LIB_MYSQL=/tmp/faas-db
+FAAS_DB_PORT=8306
+
+# TODO - remove to external resource
+FAAS_DB_ROOT_PASSWORD=secure
diff --git a/conf/faas-db.compose.yml b/conf/faas-db.compose.yml
new file mode 100644
index 0000000..a182374
--- /dev/null
+++ b/conf/faas-db.compose.yml
@@ -0,0 +1,15 @@
+version: '3.1'
+
+services:
+ db:
+ image: ${FAAS_DB_IMAGE}
+ build:
+ context: ../
+ dockerfile: Dockerfile
+ restart: always
+ environment:
+ MYSQL_ROOT_PASSWORD: ${FAAS_DB_ROOT_PASSWORD}
+ volumes:
+ - ${FAAS_DB_VOLUME_VAR_LIB_MYSQL}:/var/lib/mysql
+ ports:
+ - "${FAAS_DB_PORT}:3306"
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index 9ef5803..0000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-FROM mysql:8.0.22
diff --git a/scripts/build.sh b/scripts/build.sh
new file mode 100755
index 0000000..b1c82a0
--- /dev/null
+++ b/scripts/build.sh
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+docker-compose --env-file ../conf/faas-db.cnf -f ../conf/faas-db.compose.yml build
diff --git a/scripts/faas-mysql.build b/scripts/faas-mysql.build
deleted file mode 100755
index 5f4039c..0000000
--- a/scripts/faas-mysql.build
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/bash
-
-docker build ../docker -t faas/faas-db:1.0-SNAPSHOT
diff --git a/scripts/run.sh b/scripts/run.sh
new file mode 100755
index 0000000..38268c8
--- /dev/null
+++ b/scripts/run.sh
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+docker-compose --env-file ../conf/faas-db.cnf -f ../conf/faas-db.compose.yml up
--
GitLab