epgstation-nvencを復活

README.md

@@ -58,6 +58,6 @@ Mirakurun, MySQLを同時起動する設定になっています.
 
 ## 備考
 x264の代わりにnvencを使用してエンコードを行うための設定が
-epgstation/config/config.yml.template
+epgstation-nvenc/config/config.yml.template
 に格納されており、
 イメージの/app/config直下にコピーされています。

docker-compose.yml

@@ -50,10 +50,10 @@ services:
               - driver: nvidia
                 capabilities: [gpu,video,utility]
         volumes:
-            - ./epgstation/config:/app/config
-            - ./epgstation/data:/app/data
-            - ./epgstation/thumbnail:/app/thumbnail
-            - ./epgstation/logs:/app/logs
+            - ./epgstation-nvenc/config:/app/config
+            - ./epgstation-nvenc/data:/app/data
+            - ./epgstation-nvenc/thumbnail:/app/thumbnail
+            - ./epgstation-nvenc/logs:/app/logs
             - ./recorded:/app/recorded
         environment:
             TZ: "Asia/Tokyo"

epgstation/Dockerfile → epgstation-nvenc/Dockerfile

@@ -83,7 +83,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 COPY --from=l3tnun/epgstation:master-debian /app /app/
 COPY --from=l3tnun/epgstation:master-debian /app/client /app/client/
 COPY --from=ffmpeg-build /ffmpeg /usr/local/
-COPY .nvenc_config/ /app/config
+COPY config/ /app/config
 RUN chmod 444 /app/src -R
 
 # dry run

setup.sh

@@ -7,15 +7,15 @@ cd /tmp
 git clone https://github.com/l3tnun/docker-mirakurun-epgstation.git
 cd docker-mirakurun-epgstation
 rm -rf ./.gi*
-cp -r ./* $INSTALLDIR -n
+cp -r ./epgstation $INSTALLDIR/.epgstation -n
 cd ..
 rm -rf docker-mirakurun-epgstation
 
 cd $INSTALLDIR
 #cp docker-compose-sample.yml docker-compose.yml
-cp epgstation/config/enc.js.template epgstation/config/enc.js
-cp epgstation/config/config.yml.template epgstation/config/config.yml
-cp epgstation/config/operatorLogConfig.sample.yml epgstation/config/operatorLogConfig.yml
-cp epgstation/config/epgUpdaterLogConfig.sample.yml epgstation/config/epgUpdaterLogConfig.yml
-cp epgstation/config/serviceLogConfig.sample.yml epgstation/config/serviceLogConfig.yml
+cp .epgstation/config/enc.js.template epgstation-nvenc/config/enc.js
+cp epgstation-nvenc/config/config.yml.template epgstation-nvenc/config/config.yml
+cp .epgstation/config/operatorLogConfig.sample.yml epgstation-nvenc/config/operatorLogConfig.yml
+cp .epgstation/config/epgUpdaterLogConfig.sample.yml epgstation-nvenc/config/epgUpdaterLogConfig.yml
+cp .epgstation/config/serviceLogConfig.sample.yml epgstation-nvenc/config/serviceLogConfig.yml
 docker-compose run --rm -e SETUP=true mirakurun

single-container.sh

@@ -7,4 +7,4 @@ git sparse-checkout init
 git sparse-checkout set epgstation
 git checkout master
 
-DOCKER_BUILDKIT=1 docker build ./epgstation/
+DOCKER_BUILDKIT=1 docker build ./epgstation-nvenc/