From 695c935b990f4014ad6584a1c836a90a06115b78 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Mon, 1 Feb 2021 15:52:26 +0800
Subject: [PATCH] add mantomo

---
 README.md                    |  2 +-
 {piwik => matomo}/Dockerfile |  0
 {piwik => matomo}/README.md  |  0
 matomo/docker-compose.yml    | 32 ++++++++++++++++++++++++++++++++
 piwik/docker-compose.yml     | 14 --------------
 5 files changed, 33 insertions(+), 15 deletions(-)
 rename {piwik => matomo}/Dockerfile (100%)
 rename {piwik => matomo}/README.md (100%)
 create mode 100644 matomo/docker-compose.yml
 delete mode 100644 piwik/docker-compose.yml

diff --git a/README.md b/README.md
index 60ae05d..caf2651 100644
--- a/README.md
+++ b/README.md
@@ -190,7 +190,6 @@ A collection of delicious docker recipes.
 - [x] phpbb
 - [x] phpmyadmin-arm
 - [x] phpvirtualbox-arm
-- [x] piwik
 - [x] revive
 - [x] tabula
 - [x] tiddlywiki
@@ -336,6 +335,7 @@ A collection of delicious docker recipes.
 - [x] jazzdd/phpvirtualbox
 - [x] sonatype/nexus3
 - [x] jupyter/notebook
+- [x] matomo
 - [x] metabase/metabase
 - [x] metasploitframework/metasploit-framework :skull:
 - [x] minio/minio
diff --git a/piwik/Dockerfile b/matomo/Dockerfile
similarity index 100%
rename from piwik/Dockerfile
rename to matomo/Dockerfile
diff --git a/piwik/README.md b/matomo/README.md
similarity index 100%
rename from piwik/README.md
rename to matomo/README.md
diff --git a/matomo/docker-compose.yml b/matomo/docker-compose.yml
new file mode 100644
index 0000000..3b598ab
--- /dev/null
+++ b/matomo/docker-compose.yml
@@ -0,0 +1,32 @@
+version: "3.8"
+
+x-matomo-environment: &matomo_environment
+  - MATOMO_DATABASE_HOST=mysql
+  - MATOMO_DATABASE_ADAPTER=mysql
+  - MATOMO_DATABASE_TABLES_PREFIX=matomo_
+  - MATOMO_DATABASE_USERNAME=matomo
+  - MATOMO_DATABASE_PASSWORD=matomo
+  - MATOMO_DATABASE_DBNAME=matomo
+
+x-mysql-environment: &mysql_environment
+  - MYSQL_PASSWORD=matomo
+  - MYSQL_DATABASE=matomo
+  - MYSQL_USER=matomo
+
+services:
+
+  matomo:
+    image: matomo
+    ports:
+      - "8000:80"
+    environment: *matomo_environment
+    depends:
+      - mysql
+    restart: unless-stopped
+  
+  mysql:
+    image: mysql
+    volumes:
+      - ./data/mysql:/var/lib/mysql
+    environment: *mysql_environment
+    restart: unless-stopped
diff --git a/piwik/docker-compose.yml b/piwik/docker-compose.yml
deleted file mode 100644
index f8ae080..0000000
--- a/piwik/docker-compose.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-piwik:
-  image: vimagick/piwik
-  ports:
-    - "8000:80"
-  links:
-    - mysql
-  restart: always
-
-mysql:
-  image: mysql
-  environment:
-    - MYSQL_ROOT_PASSWORD=root
-    - MYSQL_DATABASE=piwik
-  restart: always