From 23e67d7576f4d168e9f8085fa5c9b6f5ba5a5c29 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Sun, 9 Feb 2020 19:56:46 +0800
Subject: [PATCH] update

---
 frp/Dockerfile                  |  2 +-
 frp/arm/Dockerfile              |  2 +-
 node-red/arm/docker-compose.yml |  2 +-
 openmeetings/docker-compose.yml | 39 +++++++++++++++++++++++----------
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/frp/Dockerfile b/frp/Dockerfile
index 5d274f8..573784c 100644
--- a/frp/Dockerfile
+++ b/frp/Dockerfile
@@ -5,7 +5,7 @@
 FROM alpine
 MAINTAINER kev <noreply@easypi.pro>
 
-ENV FRP_VERSION 0.29.0
+ENV FRP_VERSION 0.31.2
 ENV FRP_URL https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/frp_${FRP_VERSION}_linux_amd64.tar.gz
 
 WORKDIR /opt/frp
diff --git a/frp/arm/Dockerfile b/frp/arm/Dockerfile
index 2ee4289..4660838 100644
--- a/frp/arm/Dockerfile
+++ b/frp/arm/Dockerfile
@@ -5,7 +5,7 @@
 FROM arm32v7/alpine:3
 MAINTAINER EasyPi Software Foundation
 
-ENV FRP_VERSION 0.29.0
+ENV FRP_VERSION 0.31.2
 ENV FRP_URL https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/frp_${FRP_VERSION}_linux_arm.tar.gz
 
 WORKDIR /opt/frp
diff --git a/node-red/arm/docker-compose.yml b/node-red/arm/docker-compose.yml
index da94bd8..2b760c0 100644
--- a/node-red/arm/docker-compose.yml
+++ b/node-red/arm/docker-compose.yml
@@ -5,5 +5,5 @@ node-red:
   volumes:
     - ./data:/data
     - /dev/input:/dev/input
-  privileged: yes
+  privileged: true
   restart: always
diff --git a/openmeetings/docker-compose.yml b/openmeetings/docker-compose.yml
index 1150a49..d37fb56 100644
--- a/openmeetings/docker-compose.yml
+++ b/openmeetings/docker-compose.yml
@@ -5,17 +5,20 @@ services:
   openmeetings:
     image: apache/openmeetings:min-5.0.0-M3
     ports:
-      - "5443:5443"
+      - "5080:5080"
     volumes:
       - ./data/omdata:/opt/omdata
     environment:
       - OM_KURENTO_WS_URL=ws://kurento:8888/kurento
-      - OM_DB_HOST=mysql
-      - OM_DB_USER=root
-      - OM_DB_PASS=root
+      - OM_DB_TYPE=postgresql
+      - OM_DB_HOST=postgresql
+      - OM_DB_PORT=5432
+      - OM_DB_USER=openmeetings
+      - OM_DB_PASS=openmeetings
       - OM_DB_NAME=openmeetings
-      - OM_USER=admin
-      - OM_PASS=admin
+    depends_on:
+      - kurento
+      - postgresql
     restart: unless-stopped
 
   kurento:
@@ -23,12 +26,24 @@ services:
     ports:
       - "8888:8888"
     restart: unless-stopped
-  
-  mysql:
-    image: mysql
+
+  postgresql:
+    image: postgres:alpine
     volumes:
-      - ./data/mysql:/var/lib/mysql
+      - ./data/postgresql:/var/lib/postgresql/data
     environment:
-      - MYSQL_ROOT_PASSWORD=root
-      - MYSQL_DATABASE=openmeetings
+      - POSTGRES_USER=openmeetings
+      - POSTGRES_PASSWORD=openmeetings
+      - POSTGRES_DB=openmeetings
     restart: unless-stopped
+  
+# mysql:
+#   image: mysql
+#   volumes:
+#     - ./data/mysql:/var/lib/mysql
+#   environment:
+#     - MYSQL_ROOT_PASSWORD=root
+#     - MYSQL_USER=openmeetings
+#     - MYSQL_PASSWORD=openmeetings
+#     - MYSQL_DATABASE=openmeetings
+#   restart: unless-stopped