hide ports

README.MD

@@ -1 +1,5 @@
 Докерфайл для сборки mumble-server для arm64 (Rock PI 5)
+
+ docker stop mumble-srv && docker rm mumble-srv && docker rmi mumble-mumble-srv && git pull && docker compose up -d
+ docker stop mumble-srv && docker rm mumble-srv && docker rmi mumble-mumble-srv && docker builder prune && git pull && docker compose up -d
+  

docker-compose.yml

@@ -1,13 +1,69 @@
 version: '3'
 services:
-  mumble-server:
+  
+  mumble-srv:
     build: 
-      context: .
+      context: server/.
-      dockerfile: Dockerfile.multistage
+    container_name: mumble-srv
+    restart: unless-stopped
+    environment:
+      - SUPER_USER_PASSWORD=123456789
     volumes: 
-      - /mnt/data/mumble/data/conf:/etc/murmur
+      - /mnt/data/mumble/server/ini:/opt/mumble/ini:rw
-      - /mnt/data/mumble/data/db:/var/lib/murmur
+      - /mnt/data/mumble/server/db:/opt/mumble/db:rw  
+      - /mnt/data/mumble/server/log:/opt/mumble/log:rw    
+      - /mnt/data/nginx/letsencrypt:/etc/letsencrypt:ro    
     ports:
       - 64738:64738/tcp
       - 64738:64738/udp
       - 50051:50051
+    networks:
+      - mumble-net
+
+  mumble-botamusique:
+      image: azlux/botamusique
+      container_name: mumble-botamusique     
+      restart: unless-stopped
+#      ports:
+#          - 8181:8181/tcp
+#          - 8181:8181/udp
+      environment:
+          BAM_CONFIG_file: /config/bot.ini
+          BAM_CERTIFICATE: /config/bot.pem
+          BAM_MUSIC_DB: /config/music.db
+          BAM_DB: /config/setting.db
+          BAM_MUMBLE_SERVER: 'mumble-srv'
+          BAM_MUMBLE_PORT: 64738
+          BAM_USER: Гусляр
+          BAM_CHANNEL: Концертный зал
+      volumes:
+          - /mnt/data/mumble/botamusique/music_folder:/botamusique/music_folder
+          - /mnt/data/mumble/botamusique/config:/config
+      cpus: 2
+      
+  
+#  mumble-admin:
+#    build: mumble-django/. 
+#    container_name: admin   
+#    restart: unless-stopped
+#    depends_on:
+#      - mumble-srv
+#    ports:
+#      - 9999:9000
+#    volumes:
+#      - /etc/localtime:/etc/localtime:ro
+#      - /mnt/data/mumble/test:/mumble
+#      - /mnt/data/mumble/mumble-django:/opt/mumble-django/db
+#      - mumble_ice:/opt/mumble/ice
+#    environment:
+#      - MURMUR_CONNSTR=Meta:tcp -h murmur -p 6502
+#      - MURMUR_ICESECRET=''
+#    networks:
+#      - mumble-net
+
+networks:
+    mumble-net:
+
+#volumes:
+#  mumble_ice:
+#    name: mumble_ice

mumble-django/Dockerfile

@@ -0,0 +1,34 @@
+FROM ubuntu:focal
+
+RUN apt-get update 
+RUN apt install -y mercurial patch
+
+WORKDIR /opt
+RUN hg clone https://bitbucket.org/Svedrin/mumble-django
+
+COPY IceEncodingVersion.patch /opt/mumble-django
+WORKDIR /opt/mumble-django
+RUN patch -p1 < IceEncodingVersion.patch
+
+RUN mkdir -p /opt/mumble/ice
+
+RUN apt-get install -y python-pil python-pip
+
+# Install older version of django
+RUN pip install django==1.7
+
+# Install zeroc-ice
+RUN apt-get install -y libssl-dev libbz2-dev
+RUN pip install zeroc-ice
+
+# mumble-django is looking for Murmur.ice in /usr/share/slice
+# our share volume will mount it at /opt/mumble/ice/Murmur.ice
+# link it to the correct place
+RUN mkdir -p /usr/share/slice
+RUN ln -s /opt/mumble/ice/Murmur.ice /usr/share/slice/Murmur.ice
+
+VOLUME ["/opt/mumble-django/db"]
+
+EXPOSE 9000/tcp
+
+CMD [ "python", "/opt/mumble-django/pyweb/manage.py", "runserver", "0.0.0.0:9000" ]

mumble-django/IceEncodingVersion.patch

@@ -0,0 +1,11 @@
+diff -ruN mumble-django/pyweb/mumble/MumbleCtlIce.py mumble-django.new/pyweb/mumble/MumbleCtlIce.py
+--- mumble-django/pyweb/mumble/MumbleCtlIce.py	2020-08-14 19:42:55.375078615 +0200
++++ mumble-django.new/pyweb/mumble/MumbleCtlIce.py	2020-08-14 19:50:04.321710768 +0200
+@@ -94,6 +94,7 @@
+     prop = Ice.createProperties([])
+     prop.setProperty("Ice.ImplicitContext", "Shared")
+     prop.setProperty("Ice.MessageSizeMax",  "65535")
++    prop.setProperty("Ice.Default.EncodingVersion", "1.0")
+ 
+     idd = Ice.InitializationData()
+     idd.properties = prop

server/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:focal AS builder
 
 # needed to install tzdata
 ARG DEBIAN_FRONTEND=noninteractive
@@ -30,14 +30,12 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/*
 
-
 WORKDIR /root
 RUN git clone -b 1.5.x https://github.com/mumble-voip/mumble.git
 WORKDIR /root/mumble
 RUN git submodule update --init --recursive
 WORKDIR /root/mumble/build
 
-RUN git submodule update --init --recursive
 RUN cmake -Dclient=OFF -DCMAKE_BUILD_TYPE=Release -Dgrpc=ON .. || \
     ( cat \
     /root/mumble/build/CMakeFiles/CMakeOutput.log \
@@ -45,15 +43,14 @@ RUN cmake -Dclient=OFF -DCMAKE_BUILD_TYPE=Release -Dgrpc=ON .. || \
     && false \
     )
 RUN make -j $(nproc)
-RUN ls
-RUN cat /root/mumble/build/mumble-server.ini
 
 # Clean distribution stage
-FROM ubuntu:focal
+FROM ubuntu:focal as prod
 
 ARG DEBIAN_FRONTEND=noninteractive
+ARG SUPER_USER_PASSWORD=12345678
 
-RUN adduser murmur
+#RUN adduser mumble
 RUN apt-get update && apt-get install --no-install-recommends -y \
 	libcap2 \
 	libzeroc-ice3.7 \
@@ -73,14 +70,23 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/*
 
-COPY --from=0 /root/mumble/build/mumble-server /usr/bin/mumble-server
+RUN mkdir /opt/mumble && \
-COPY --from=0 /root/mumble/build/mumble-server.ini /etc/murmur/murmur.ini
+	mkdir /opt/mumble/db && \
+	mkdir /opt/mumble/ini && \
+	mkdir /opt/mumble/log
 	
-RUN mkdir /var/lib/murmur && \
+COPY --from=builder /root/mumble/build/mumble-server /opt/mumble
-	chown --verbose murmur:murmur /var/lib/murmur && \
+COPY --from=builder /root/mumble/build/mumble-server.ini /opt/mumble/mumble-server.ini
-	sed -i 's/^database=$/database=\/var\/lib\/murmur\/murmur.sqlite/' /etc/murmur/murmur.ini
+
+RUN sed -i 's/^database=$/database=\/opt\/mumble\/db\/murmur.sqlite/' /opt/mumble/mumble-server.ini
 
 EXPOSE 64738/tcp 64738/udp 50051
-USER murmur
+VOLUME ["/opt/mumble/ini"]
+VOLUME ["/opt/mumble/db"]
+VOLUME ["/opt/mumble/log"]
 
-CMD /usr/bin/mumble-server -v -fg -ini /etc/murmur/murmur.ini
+WORKDIR /
+
+CMD cp -n /opt/mumble/mumble-server.ini /opt/mumble/ini/ && \
+	/opt/mumble/mumble-server -v -fg -ini /opt/mumble/ini/mumble-server.ini -supw $SUPER_USER_PASSWORD && \
+	/opt/mumble/mumble-server -v -fg -ini /opt/mumble/ini/mumble-server.ini