From c6452a47aedf9c78c68c3b3ab0c1cdfb59c84fd8 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Mon, 19 Dec 2022 17:02:55 +0800
Subject: [PATCH] update frp

---
 frp/Dockerfile                  |  5 +++--
 frp/arm/Dockerfile              | 21 ---------------------
 frp/arm/data/frps.ini           |  9 ---------
 frp/arm/docker-compose.yml      |  9 ---------
 openmeetings/docker-compose.yml |  6 +++---
 5 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 frp/arm/Dockerfile
 delete mode 100644 frp/arm/data/frps.ini
 delete mode 100644 frp/arm/docker-compose.yml

diff --git a/frp/Dockerfile b/frp/Dockerfile
index 3db5b79..2dd4ed1 100644
--- a/frp/Dockerfile
+++ b/frp/Dockerfile
@@ -5,8 +5,9 @@
 FROM alpine:3
 MAINTAINER EasyPi Software Foundation
 
-ARG FRP_VERSION=0.45.0
-ARG FRP_FILE=frp_${FRP_VERSION}_linux_amd64.tar.gz
+ARG FRP_VERSION=0.46.0
+ARG FRP_ARCH=amd64
+ARG FRP_FILE=frp_${FRP_VERSION}_linux_${FRP_ARCH}.tar.gz
 ARG FRP_URL=https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/${FRP_FILE}
 
 WORKDIR /opt/frp
diff --git a/frp/arm/Dockerfile b/frp/arm/Dockerfile
deleted file mode 100644
index 136af8c..0000000
--- a/frp/arm/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Dockerfile for frp-arm
-#
-
-FROM alpine:3
-MAINTAINER EasyPi Software Foundation
-
-ARG FRP_VERSION=0.45.0
-ARG FRP_FILE=frp_${FRP_VERSION}_linux_arm.tar.gz
-ARG FRP_URL=https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/${FRP_FILE}
-
-WORKDIR /opt/frp
-
-RUN set -xe \
-    && apk add --no-cache curl tar \
-    && curl -sSL $FRP_URL | tar xz --strip 1 \
-    && apk del curl tar
-
-EXPOSE 7000/tcp 7000/udp 7500/tcp
-
-CMD ["./frps", "-c", "frps.ini"]
diff --git a/frp/arm/data/frps.ini b/frp/arm/data/frps.ini
deleted file mode 100644
index bf6d00d..0000000
--- a/frp/arm/data/frps.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[common]
-bind_addr = 0.0.0.0
-bind_port = 7000
-kcp_bind_port = 7000
-dashboard_port = 7500
-dashboard_user = admin
-dashboard_pwd = admin
-privilege_token = 12345678
-privilege_allow_ports = 2222,20000-20100
diff --git a/frp/arm/docker-compose.yml b/frp/arm/docker-compose.yml
deleted file mode 100644
index 2b5713f..0000000
--- a/frp/arm/docker-compose.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: "3.8"
-services:
-  frpc:
-    image: easypi/frp-arm
-    command: ./frpc -c frpc.ini
-    volumes:
-      - ./data/frpc.ini:/opt/frp/frpc.ini
-    network_mode: host
-    restart: unless-stopped
diff --git a/openmeetings/docker-compose.yml b/openmeetings/docker-compose.yml
index 953955a..a67b554 100644
--- a/openmeetings/docker-compose.yml
+++ b/openmeetings/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.8'
 services:
 
   openmeetings:
-    image: apache/openmeetings:min-5.1.0
+    image: apache/openmeetings:min-6.3.0
     ports:
       - "5080:5080"
     volumes:
@@ -22,13 +22,13 @@ services:
     restart: unless-stopped
 
   kurento:
-    image: kurento/kurento-media-server
+    image: kurento/kurento-media-server:6
     ports:
       - "8888:8888"
     restart: unless-stopped
 
   postgresql:
-    image: postgres:alpine
+    image: postgres:15-alpine
     volumes:
       - ./data/postgresql:/var/lib/postgresql/data
     environment: