diff --git a/docker-compose.yml b/docker-compose.yml index 84a96e5..8d02b17 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 \ No newline at end of file +#volumes: +# mumble_ice: +# name: mumble_ice \ No newline at end of file diff --git a/server/Dockerfile b/server/Dockerfile index d67fd34..5b10216 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -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