Merge pull request #137 from ptr727/develop

Develop
ptr727 · Mar 14, 2024 · db560b6 · db560b6
2 parents 60fdac3 + 2008472
commit db560b6
Show file tree

Hide file tree

Showing 122 changed files with 344 additions and 1,215 deletions.
diff --git a/.github/workflows/BuildPublishPipeline.yml b/.github/workflows/BuildPublishPipeline.yml
@@ -143,8 +143,8 @@ jobs:
         with:
           cache-from: type=gha,scope=${{ matrix.images.cachescope }}
           cache-to: type=gha,mode=max,scope=${{ matrix.images.cachescope }}
-          context: ${{ matrix.images.name }}
-          file: ${{ matrix.images.name }}/Dockerfile
+          context: Docker
+          file: Docker/${{ matrix.images.name }}.Dockerfile
           platforms: linux/amd64,linux/arm64
           # Push only if not a pull request and branch name matches current branch
           push: ${{ (github.event_name != 'pull_request') && (github.ref_name == matrix.images.branch) }}

diff --git a/DWSpectrum-LSIO/.dockerignore b/DWSpectrum-LSIO/.dockerignore
diff --git a/DWSpectrum/.dockerignore b/DWSpectrum/.dockerignore
diff --git a/DWSpectrum/Download.sh b/DWSpectrum/Download.sh
diff --git a/DWSpectrum-LSIO/Dockerfile → Docker/DWSpectrum-LSIO.Dockerfile b/DWSpectrum-LSIO/Dockerfile → Docker/DWSpectrum-LSIO.Dockerfile
@@ -60,11 +60,11 @@ RUN apt-get update \
 
 # Download the installer file
 RUN mkdir -p /temp
-COPY Download.sh /temp/Download.sh
+COPY download.sh /temp/download.sh
 # Set the working directory to /temp
 WORKDIR /temp
-RUN chmod +x Download.sh \
-    && ./Download.sh
+RUN chmod +x download.sh \
+    && ./download.sh
 
 # LSIO maps the host PUID and PGID environment variables to "abc" in the container.
 # The mediaserver calls "chown ${COMPANY_NAME}" at runtime
@@ -97,7 +97,7 @@ RUN chown --verbose ${COMPANY_NAME}:${COMPANY_NAME} /opt/${COMPANY_NAME}/mediase
 # Copy etc init and services files
 # https://github.com/just-containers/s6-overlay#container-environment
 # https://www.linuxserver.io/blog/how-is-container-formed
-COPY root/etc /etc
+COPY s6-overlay /etc/s6-overlay
 
 # Expose port 7001
 EXPOSE 7001

diff --git a/DWSpectrum/Dockerfile → Docker/DWSpectrum.Dockerfile b/DWSpectrum/Dockerfile → Docker/DWSpectrum.Dockerfile
@@ -60,11 +60,11 @@ RUN apt-get update \
 
 # Download the installer file
 RUN mkdir -p /temp
-COPY Download.sh /temp/Download.sh
+COPY download.sh /temp/download.sh
 # Set the working directory to /temp
 WORKDIR /temp
-RUN chmod +x Download.sh \
-    && ./Download.sh
+RUN chmod +x download.sh \
+    && ./download.sh
 
 # Install the mediaserver and dependencies
 RUN apt-get update \
@@ -84,7 +84,7 @@ RUN echo "${COMPANY_NAME} ALL = NOPASSWD: /opt/${COMPANY_NAME}/mediaserver/bin/r
 
 # Copy the entrypoint.sh launch script
 # entrypoint.sh will run the mediaserver and root-tool
-COPY root/entrypoint.sh /opt/entrypoint.sh
+COPY entrypoint.sh /opt/entrypoint.sh
 RUN chmod +x /opt/entrypoint.sh
 
 # Run the entrypoint as the mediaserver ${COMPANY_NAME} user

diff --git a/...ig-end/dependencies.d/init-nx-permissions → Docker/NXMeta.Dockerfile b/...ig-end/dependencies.d/init-nx-permissions → Docker/NXMeta.Dockerfile
diff --git a/NxMeta-LSIO/Dockerfile → Docker/NxMeta-LSIO.Dockerfile b/NxMeta-LSIO/Dockerfile → Docker/NxMeta-LSIO.Dockerfile
@@ -60,11 +60,11 @@ RUN apt-get update \
 
 # Download the installer file
 RUN mkdir -p /temp
-COPY Download.sh /temp/Download.sh
+COPY download.sh /temp/download.sh
 # Set the working directory to /temp
 WORKDIR /temp
-RUN chmod +x Download.sh \
-    && ./Download.sh
+RUN chmod +x download.sh \
+    && ./download.sh
 
 # LSIO maps the host PUID and PGID environment variables to "abc" in the container.
 # The mediaserver calls "chown ${COMPANY_NAME}" at runtime
@@ -97,7 +97,7 @@ RUN chown --verbose ${COMPANY_NAME}:${COMPANY_NAME} /opt/${COMPANY_NAME}/mediase
 # Copy etc init and services files
 # https://github.com/just-containers/s6-overlay#container-environment
 # https://www.linuxserver.io/blog/how-is-container-formed
-COPY root/etc /etc
+COPY s6-overlay /etc/s6-overlay
 
 # Expose port 7001
 EXPOSE 7001

diff --git a/NxMeta/Dockerfile → Docker/NxMeta.Dockerfile b/NxMeta/Dockerfile → Docker/NxMeta.Dockerfile
@@ -60,11 +60,11 @@ RUN apt-get update \
 
 # Download the installer file
 RUN mkdir -p /temp
-COPY Download.sh /temp/Download.sh
+COPY download.sh /temp/download.sh
 # Set the working directory to /temp
 WORKDIR /temp
-RUN chmod +x Download.sh \
-    && ./Download.sh
+RUN chmod +x download.sh \
+    && ./download.sh
 
 # Install the mediaserver and dependencies
 RUN apt-get update \
@@ -84,7 +84,7 @@ RUN echo "${COMPANY_NAME} ALL = NOPASSWD: /opt/${COMPANY_NAME}/mediaserver/bin/r
 
 # Copy the entrypoint.sh launch script
 # entrypoint.sh will run the mediaserver and root-tool
-COPY root/entrypoint.sh /opt/entrypoint.sh
+COPY entrypoint.sh /opt/entrypoint.sh
 RUN chmod +x /opt/entrypoint.sh
 
 # Run the entrypoint as the mediaserver ${COMPANY_NAME} user

diff --git a/NxWitness-LSIO/Dockerfile → Docker/NxWitness-LSIO.Dockerfile b/NxWitness-LSIO/Dockerfile → Docker/NxWitness-LSIO.Dockerfile
@@ -60,11 +60,11 @@ RUN apt-get update \
 
 # Download the installer file
 RUN mkdir -p /temp
-COPY Download.sh /temp/Download.sh
+COPY download.sh /temp/download.sh
 # Set the working directory to /temp
 WORKDIR /temp
-RUN chmod +x Download.sh \
-    && ./Download.sh
+RUN chmod +x download.sh \
+    && ./download.sh
 
 # LSIO maps the host PUID and PGID environment variables to "abc" in the container.
 # The mediaserver calls "chown ${COMPANY_NAME}" at runtime
@@ -97,7 +97,7 @@ RUN chown --verbose ${COMPANY_NAME}:${COMPANY_NAME} /opt/${COMPANY_NAME}/mediase
 # Copy etc init and services files
 # https://github.com/just-containers/s6-overlay#container-environment
 # https://www.linuxserver.io/blog/how-is-container-formed
-COPY root/etc /etc
+COPY s6-overlay /etc/s6-overlay
 
 # Expose port 7001
 EXPOSE 7001

diff --git a/NxWitness/Dockerfile → Docker/NxWitness.Dockerfile b/NxWitness/Dockerfile → Docker/NxWitness.Dockerfile
@@ -60,11 +60,11 @@ RUN apt-get update \
 
 # Download the installer file
 RUN mkdir -p /temp
-COPY Download.sh /temp/Download.sh
+COPY download.sh /temp/download.sh
 # Set the working directory to /temp
 WORKDIR /temp
-RUN chmod +x Download.sh \
-    && ./Download.sh
+RUN chmod +x download.sh \
+    && ./download.sh
 
 # Install the mediaserver and dependencies
 RUN apt-get update \
@@ -84,7 +84,7 @@ RUN echo "${COMPANY_NAME} ALL = NOPASSWD: /opt/${COMPANY_NAME}/mediaserver/bin/r
 
 # Copy the entrypoint.sh launch script
 # entrypoint.sh will run the mediaserver and root-tool
-COPY root/entrypoint.sh /opt/entrypoint.sh
+COPY entrypoint.sh /opt/entrypoint.sh
 RUN chmod +x /opt/entrypoint.sh
 
 # Run the entrypoint as the mediaserver ${COMPANY_NAME} user

diff --git a/DWSpectrum-LSIO/Download.sh → Docker/download.sh b/DWSpectrum-LSIO/Download.sh → Docker/download.sh
diff --git a/DWSpectrum/root/entrypoint.sh → Docker/entrypoint.sh b/DWSpectrum/root/entrypoint.sh → Docker/entrypoint.sh
diff --git a/...locate/dependencies.d/init-nx-permissions → ...ig-end/dependencies.d/init-nx-permissions b/...locate/dependencies.d/init-nx-permissions → ...ig-end/dependencies.d/init-nx-permissions
diff --git a/...onfig-end/dependencies.d/init-nx-relocate → ...onfig-end/dependencies.d/init-nx-relocate b/...onfig-end/dependencies.d/init-nx-relocate → ...onfig-end/dependencies.d/init-nx-relocate
diff --git a/...6-overlay/s6-rc.d/init-nx-permissions/run → ...6-overlay/s6-rc.d/init-nx-permissions/run b/...6-overlay/s6-rc.d/init-nx-permissions/run → ...6-overlay/s6-rc.d/init-nx-permissions/run
diff --git a/...-overlay/s6-rc.d/init-nx-permissions/type → ...-overlay/s6-rc.d/init-nx-permissions/type b/...-overlay/s6-rc.d/init-nx-permissions/type → ...-overlay/s6-rc.d/init-nx-permissions/type
diff --git a/...s6-overlay/s6-rc.d/init-nx-permissions/up → ...s6-overlay/s6-rc.d/init-nx-permissions/up b/...s6-overlay/s6-rc.d/init-nx-permissions/up → ...s6-overlay/s6-rc.d/init-nx-permissions/up
diff --git a/...-rc.d/user/contents.d/init-nx-permissions → ...locate/dependencies.d/init-nx-permissions b/...-rc.d/user/contents.d/init-nx-permissions → ...locate/dependencies.d/init-nx-permissions
diff --git a/...c/s6-overlay/s6-rc.d/init-nx-relocate/run → ...r/s6-overlay/s6-rc.d/init-nx-relocate/run b/...c/s6-overlay/s6-rc.d/init-nx-relocate/run → ...r/s6-overlay/s6-rc.d/init-nx-relocate/run
diff --git a/.../s6-overlay/s6-rc.d/init-nx-relocate/type → .../s6-overlay/s6-rc.d/init-nx-relocate/type b/.../s6-overlay/s6-rc.d/init-nx-relocate/type → .../s6-overlay/s6-rc.d/init-nx-relocate/type
diff --git a/...tc/s6-overlay/s6-rc.d/init-nx-relocate/up → ...er/s6-overlay/s6-rc.d/init-nx-relocate/up b/...tc/s6-overlay/s6-rc.d/init-nx-relocate/up → ...er/s6-overlay/s6-rc.d/init-nx-relocate/up
diff --git a/...-mediaserver/dependencies.d/init-services → ...-mediaserver/dependencies.d/init-services b/...-mediaserver/dependencies.d/init-services → ...-mediaserver/dependencies.d/init-services
diff --git a/...ediaserver/dependencies.d/svc-nx-roottool → ...ediaserver/dependencies.d/svc-nx-roottool b/...ediaserver/dependencies.d/svc-nx-roottool → ...ediaserver/dependencies.d/svc-nx-roottool
diff --git a/...s6-overlay/s6-rc.d/svc-nx-mediaserver/run → ...s6-overlay/s6-rc.d/svc-nx-mediaserver/run b/...s6-overlay/s6-rc.d/svc-nx-mediaserver/run → ...s6-overlay/s6-rc.d/svc-nx-mediaserver/run
diff --git a/...6-overlay/s6-rc.d/svc-nx-mediaserver/type → ...6-overlay/s6-rc.d/svc-nx-mediaserver/type b/...6-overlay/s6-rc.d/svc-nx-mediaserver/type → ...6-overlay/s6-rc.d/svc-nx-mediaserver/type
diff --git a/...-nx-roottool/dependencies.d/init-services → ...-nx-roottool/dependencies.d/init-services b/...-nx-roottool/dependencies.d/init-services → ...-nx-roottool/dependencies.d/init-services
diff --git a/...tc/s6-overlay/s6-rc.d/svc-nx-roottool/run → ...er/s6-overlay/s6-rc.d/svc-nx-roottool/run b/...tc/s6-overlay/s6-rc.d/svc-nx-roottool/run → ...er/s6-overlay/s6-rc.d/svc-nx-roottool/run
diff --git a/...c/s6-overlay/s6-rc.d/svc-nx-roottool/type → ...r/s6-overlay/s6-rc.d/svc-nx-roottool/type b/...c/s6-overlay/s6-rc.d/svc-nx-roottool/type → ...r/s6-overlay/s6-rc.d/svc-nx-roottool/type
diff --git a/...ig-end/dependencies.d/init-nx-permissions → ...-rc.d/user/contents.d/init-nx-permissions b/...ig-end/dependencies.d/init-nx-permissions → ...-rc.d/user/contents.d/init-nx-permissions
diff --git a/.../s6-rc.d/user/contents.d/init-nx-relocate → .../s6-rc.d/user/contents.d/init-nx-relocate b/.../s6-rc.d/user/contents.d/init-nx-relocate → .../s6-rc.d/user/contents.d/init-nx-relocate
diff --git a/...6-rc.d/user/contents.d/svc-nx-mediaserver → ...6-rc.d/user/contents.d/svc-nx-mediaserver b/...6-rc.d/user/contents.d/svc-nx-mediaserver → ...6-rc.d/user/contents.d/svc-nx-mediaserver
diff --git a/...y/s6-rc.d/user/contents.d/svc-nx-roottool → ...y/s6-rc.d/user/contents.d/svc-nx-roottool b/...y/s6-rc.d/user/contents.d/svc-nx-roottool → ...y/s6-rc.d/user/contents.d/svc-nx-roottool
diff --git a/Entrypoint/entrypoint.sh b/Entrypoint/entrypoint.sh
diff --git a/LSIO/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-nx-relocate b/LSIO/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-nx-relocate
diff --git a/LSIO/etc/s6-overlay/s6-rc.d/init-nx-permissions/run b/LSIO/etc/s6-overlay/s6-rc.d/init-nx-permissions/run
diff --git a/LSIO/etc/s6-overlay/s6-rc.d/init-nx-permissions/type b/LSIO/etc/s6-overlay/s6-rc.d/init-nx-permissions/type
diff --git a/LSIO/etc/s6-overlay/s6-rc.d/init-nx-permissions/up b/LSIO/etc/s6-overlay/s6-rc.d/init-nx-permissions/up
diff --git a/LSIO/etc/s6-overlay/s6-rc.d/init-nx-relocate/dependencies.d/init-nx-permissions b/LSIO/etc/s6-overlay/s6-rc.d/init-nx-relocate/dependencies.d/init-nx-permissions
diff --git a/LSIO/etc/s6-overlay/s6-rc.d/init-nx-relocate/run b/LSIO/etc/s6-overlay/s6-rc.d/init-nx-relocate/run
diff --git a/LSIO/etc/s6-overlay/s6-rc.d/init-nx-relocate/type b/LSIO/etc/s6-overlay/s6-rc.d/init-nx-relocate/type
diff --git a/LSIO/etc/s6-overlay/s6-rc.d/init-nx-relocate/up b/LSIO/etc/s6-overlay/s6-rc.d/init-nx-relocate/up
diff --git a/LSIO/etc/s6-overlay/s6-rc.d/svc-nx-mediaserver/dependencies.d/init-services b/LSIO/etc/s6-overlay/s6-rc.d/svc-nx-mediaserver/dependencies.d/init-services
diff --git a/LSIO/etc/s6-overlay/s6-rc.d/svc-nx-mediaserver/dependencies.d/svc-nx-roottool b/LSIO/etc/s6-overlay/s6-rc.d/svc-nx-mediaserver/dependencies.d/svc-nx-roottool
diff --git a/LSIO/etc/s6-overlay/s6-rc.d/svc-nx-mediaserver/run b/LSIO/etc/s6-overlay/s6-rc.d/svc-nx-mediaserver/run
diff --git a/LSIO/etc/s6-overlay/s6-rc.d/svc-nx-mediaserver/type b/LSIO/etc/s6-overlay/s6-rc.d/svc-nx-mediaserver/type
diff --git a/LSIO/etc/s6-overlay/s6-rc.d/svc-nx-roottool/dependencies.d/init-services b/LSIO/etc/s6-overlay/s6-rc.d/svc-nx-roottool/dependencies.d/init-services