Убираю костыль

main
L_DelOff 2023-09-24 10:49:09 +03:00
parent b5982e84d4
commit be56032bf3
2 changed files with 26 additions and 24 deletions

View File

@ -16,28 +16,28 @@ services:
networks:
- mumble-net
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
# 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
#volumes:
# mumble_ice:
# name: mumble_ice

View File

@ -74,12 +74,14 @@ RUN mkdir /opt/mumble && \
mkdir /opt/mumble/ini
COPY --from=builder /root/mumble/build/mumble-server /opt/mumble
COPY --from=builder /root/mumble/build/mumble-server.ini /opt/mumble/mumble-server.ini
COPY --from=builder /root/mumble/build/mumble-server.ini /opt/mumble/ini/mumble-server.ini
RUN sed -i 's/^database=$/database=\/opt\/mumble\/db\/murmur.sqlite/' /opt/mumble/mumble-server.ini
EXPOSE 64738/tcp 64738/udp 50051
VOLUME ["/opt/mumble/ini"]
VOLUME ["/opt/mumble/db"]
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
#CMD cp -n /opt/mumble/mumble-server.ini /opt/mumble/ini/ && \
CMD /opt/mumble/mumble-server -v -fg -ini /opt/mumble/ini/mumble-server.ini