Skip to content

Commit 4285f93

Browse files
committed
VMS-60430: Update docker-compose yaml
- Remove root-tool container - Use tmpfs for /tmp volume
1 parent fd06101 commit 4285f93

4 files changed

Lines changed: 8 additions & 14 deletions

File tree

Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ RUN chown ${COMPANY}: /opt/${COMPANY}/mediaserver/var/
3434

3535
RUN echo "currentOsVariantOverride=docker" >> /opt/${COMPANY}/mediaserver/etc/mediaserver.conf
3636

37+
# Disable root-tool to run in non-privileged mode.
38+
# The /recording folder is not recognized correctly, and the issue can be observed in verbose logs:
39+
# /recordings (ext4) — not a folder.
40+
RUN echo "ignoreRootTool=true" >> /opt/${COMPANY}/mediaserver/etc/mediaserver.conf
41+
3742
ADD entrypoint.sh /opt/mediaserver/
3843

3944
USER ${COMPANY}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Volumes are required to configure the Sever and save its state data.
6868
| /srv/mediaserver/nx_ini | Additional configuration | /home/${COMPANY}/.config/nx_ini |
6969
| /srv/mediaserver/recordings | Video storage | /recordings |
7070
| /srv/mediaserver/var | State and logs | /opt/networkoptix/mediaserver/var |
71-
| /srv/mediaserver/tmp | Unix socket and tmp files | /opt/networkoptix/mediaserver/tmp |
71+
| **TMPFS** | Unix socket and tmp files | /opt/networkoptix/mediaserver/tmp |
7272

7373
Note that the video storage location, if modified, needs to be short. Changing the name
7474
is fine but changing the path may result in no valid storage location.

config-volumes/tmp/readme.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

docker-compose.yaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,5 @@ services:
2020
- ${VOLUMES_PATH}/nx_ini:/home/${COMPANY}/.config/nx_ini
2121
- ${VOLUMES_PATH}/entrypoint.d:/opt/mediaserver/entrypoint.d
2222
- ${VOLUMES_PATH}/recordings:/recordings
23-
- ${VOLUMES_PATH}/tmp:/tmp
24-
25-
mediaserver-root-tool:
26-
image: metavms-server:${MEDIASERVER_VERSION}
27-
user: root
28-
# root-tool-bin is for versions < 4.3, root-tool is for versions >= 4.3.
29-
command: ["/opt/${COMPANY}/mediaserver/bin/root-tool"]
30-
volumes:
31-
- ${VOLUMES_PATH}/tmp:/tmp
32-
- ${VOLUMES_PATH}/recordings:/recordings
23+
tmpfs:
24+
- /tmp

0 commit comments

Comments
 (0)