From 63f70102ecc322ab91508eb18cf8dbb0db8c2cc7 Mon Sep 17 00:00:00 2001
From: stam <stam@epicm.org>
Date: Wed, 2 Jun 2021 02:35:44 +0300
Subject: [PATCH] zabbix migrated to new format

---
 linux/zabbix/agent/Makefile                  | 9 +++++----
 linux/zabbix/agent/docker-compose.yml        | 6 ++++++
 linux/zabbix/java-gateway/Makefile           | 9 +++++----
 linux/zabbix/java-gateway/docker-compose.yml | 6 ++++++
 linux/zabbix/proxy/Makefile                  | 9 +++++----
 linux/zabbix/proxy/docker-compose.yml        | 6 ++++++
 linux/zabbix/server/Makefile                 | 9 +++++----
 linux/zabbix/server/docker-compose.yml       | 6 ++++++
 linux/zabbix/web/Makefile                    | 8 ++++----
 linux/zabbix/web/docker-compose.yml          | 6 ++++++
 10 files changed, 54 insertions(+), 20 deletions(-)
 create mode 100644 linux/zabbix/agent/docker-compose.yml
 create mode 100644 linux/zabbix/java-gateway/docker-compose.yml
 create mode 100644 linux/zabbix/proxy/docker-compose.yml
 create mode 100644 linux/zabbix/server/docker-compose.yml
 create mode 100644 linux/zabbix/web/docker-compose.yml

diff --git a/linux/zabbix/agent/Makefile b/linux/zabbix/agent/Makefile
index f10f5e9e0..82c5a2de6 100644
--- a/linux/zabbix/agent/Makefile
+++ b/linux/zabbix/agent/Makefile
@@ -1,4 +1,5 @@
-all: za
-za:
-	docker build --compress -t epicmorg/zabbix-agent .
-	docker push epicmorg/zabbix-agent
+all: app
+
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/zabbix/agent/docker-compose.yml b/linux/zabbix/agent/docker-compose.yml
new file mode 100644
index 000000000..711b522db
--- /dev/null
+++ b/linux/zabbix/agent/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/zabbix-agent:latest"
+    build:
+      context: .
diff --git a/linux/zabbix/java-gateway/Makefile b/linux/zabbix/java-gateway/Makefile
index 89dc801f9..82c5a2de6 100644
--- a/linux/zabbix/java-gateway/Makefile
+++ b/linux/zabbix/java-gateway/Makefile
@@ -1,4 +1,5 @@
-all: zjg
-zjg:
-	docker build --compress -t epicmorg/zabbix-java-gateway .
-	docker push epicmorg/zabbix-java-gateway
+all: app
+
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/zabbix/java-gateway/docker-compose.yml b/linux/zabbix/java-gateway/docker-compose.yml
new file mode 100644
index 000000000..7a2a51cd1
--- /dev/null
+++ b/linux/zabbix/java-gateway/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/zabbix-java-gateway:latest"
+    build:
+      context: .
diff --git a/linux/zabbix/proxy/Makefile b/linux/zabbix/proxy/Makefile
index 33412b137..82c5a2de6 100644
--- a/linux/zabbix/proxy/Makefile
+++ b/linux/zabbix/proxy/Makefile
@@ -1,4 +1,5 @@
-all: zp
-zp:
-	docker build --compress -t epicmorg/zabbix-proxy-sqlite3 .
-	docker push epicmorg/zabbix-proxy-sqlite3
+all: app
+
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/zabbix/proxy/docker-compose.yml b/linux/zabbix/proxy/docker-compose.yml
new file mode 100644
index 000000000..0f07d0583
--- /dev/null
+++ b/linux/zabbix/proxy/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/zabbix-proxy-sqlite3:latest"
+    build:
+      context: .
diff --git a/linux/zabbix/server/Makefile b/linux/zabbix/server/Makefile
index d2e05ebda..82c5a2de6 100644
--- a/linux/zabbix/server/Makefile
+++ b/linux/zabbix/server/Makefile
@@ -1,4 +1,5 @@
-all: zsm
-zsm:
-	docker build --compress -t epicmorg/zabbix-server-mysql .
-	docker push epicmorg/zabbix-server-mysql
+all: app
+
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/zabbix/server/docker-compose.yml b/linux/zabbix/server/docker-compose.yml
new file mode 100644
index 000000000..c0e262612
--- /dev/null
+++ b/linux/zabbix/server/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/zabbix-server-mysql:latest"
+    build:
+      context: .
diff --git a/linux/zabbix/web/Makefile b/linux/zabbix/web/Makefile
index 50ef03ca7..82c5a2de6 100644
--- a/linux/zabbix/web/Makefile
+++ b/linux/zabbix/web/Makefile
@@ -1,5 +1,5 @@
-all: zwam
-zwam:
-	docker build --compress -t epicmorg/zabbix-web-apache-mysql .
-	docker push epicmorg/zabbix-web-apache-mysql
+all: app
 
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/zabbix/web/docker-compose.yml b/linux/zabbix/web/docker-compose.yml
new file mode 100644
index 000000000..d8c673d98
--- /dev/null
+++ b/linux/zabbix/web/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/zabbix-web-apache-mysql:latest"
+    build:
+      context: .