Merge pull request #47 from kounoike:improvement/dvb-and-mirakc-docke…

…r-compose-config mirakcとdocker-composeの設定例を改善
kounoike · Mar 31, 2023 · 0c03ea9 · 0c03ea9
2 parents cab577e + 903c672
commit 0c03ea9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 49 deletions.
diff --git a/docker-compose/docker-compose.yml.example b/docker-compose/docker-compose.yml.example
@@ -9,6 +9,7 @@ services:
     links:
       - tuner:tuner
       - db:db
+    restart: always
   db:
     image: mariadb:latest
     volumes:
@@ -33,10 +34,11 @@ services:
       - ./mirakc/recorded:/recorded:rw
       - /var/run/pcscd:/var/run/pcscd:rw
     devices:
-      - /dev/px4video0
+      - /dev/px4video0 # for PX-W3U4
       - /dev/px4video1
       - /dev/px4video2
       - /dev/px4video3
+      # - /dev/dvb # for PX-S1UD
       - /dev/bus
     environment:
       TZ: Asia/Tokyo

diff --git a/docker-compose/mirakc/config/config.yml.example b/docker-compose/mirakc/config/config.yml.example
@@ -13,10 +13,6 @@ channels:
     type: 'GR'
     channel: '16'
 
-  - name: 'ｔｖｋ１'
-    type: 'GR'
-    channel: '18'
-
   - name: 'フジテレビ'
     type: 'GR'
     channel: '21'
@@ -105,42 +101,6 @@ channels:
     channel: 'BS9_0'
     services: [211]
 
-  - name: 'スターチャンネル１'
-    type: 'BS'
-    channel: 'BS9_1'
-    services: [200]
-
-  - name: 'ＢＳ１２トゥエルビ'
-    type: 'BS'
-    channel: 'BS9_2'
-    services: [222]
-
-  - name: 'ＢＳスカパー！'
-    type: 'BS'
-    channel: 'BS11_0'
-    services: [241]
-
-  - name: '放送大学ｅｘ'
-    type: 'BS'
-    channel: 'BS11_1'
-    services: [231]
-
-  - name: '放送大学ｏｎ'
-    type: 'BS'
-    channel: 'BS11_1'
-    services: [232]
-
-  - name: '放送大学ラジオ'
-    type: 'BS'
-    channel: 'BS11_1'
-    services: [531]
-    disabled: true
-
-  - name: 'ＢＳ釣りビジョン'
-    type: 'BS'
-    channel: 'BS11_2'
-    services: [251]
-
   - name: 'ＢＳ日テレ'
     type: 'BS'
     channel: 'BS13_0'
@@ -171,11 +131,6 @@ channels:
     channel: 'BS13_1'
     services: [183]
 
-  - name: 'ＢＳアニマックス'
-    type: 'BS'
-    channel: 'BS13_2'
-    services: [236]
-
   - name: 'ＮＨＫＢＳ１'
     type: 'BS'
     channel: 'BS15_0'
@@ -211,6 +166,18 @@ tuners:
       recpt1 --device /dev/px4video3 {{channel}} {{duration}} -
     disabled: false
 
+  # - name: DVB-T
+  #   types: [GR]
+  #   command: >-
+  #     dvbv5-zap -a 0 -C jp -c /etc/mirakc/dvbv5_channels_isdbt.conf -P {{channel}} -o -
+  #   disabled: false
+  #
+  # - name: DVB-S
+  #   types: [BS, CS]
+  #   command: >-
+  #     dvbv5-zap -a 1 -C jp -c /etc/mirakc/dvbv5_channels_isdbs.conf -P {{channel}} -o -
+  #   disabled: false
+
 filters:
   decode-filter:
     command: arib-b25-stream-test
diff --git a/docker-compose/mirakc/docker/Dockerfile b/docker-compose/mirakc/docker/Dockerfile
@@ -2,16 +2,21 @@ FROM node:18-slim
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
+    ca-certificates \
+    dvb-tools \
     libpcsclite-dev \
     pcscd \
-    pkg-config
+    pkg-config \
+    wget \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 RUN npm install arib-b25-stream-test -g --unsafe 
+RUN mkdir /etc/mirakc
+RUN wget -O /etc/mirakc/dvbv5_channels_isdbs.conf https://raw.githubusercontent.com/Chinachu/dvbconf-for-isdb/master/conf/dvbv5_channels_isdbs.conf
+RUN wget -O /etc/mirakc/dvbv5_channels_isdbt.conf https://raw.githubusercontent.com/Chinachu/dvbconf-for-isdb/master/conf/dvbv5_channels_isdbt.conf
 
-COPY --from=docker.io/mirakc/mirakc:debian /usr/bin/dvbv5-zap /usr/bin/dvbv5-zap
 COPY --from=docker.io/mirakc/mirakc:debian /usr/local/bin/* /usr/local/bin/
 COPY --from=docker.io/mirakc/mirakc:debian /etc/mirakc/strings.yml /etc/mirakc/strings.yml
 ENV MIRAKC_CONFIG=/etc/mirakc/config.yml
 
 ENTRYPOINT ["/usr/local/bin/mirakc"]
-