diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 518b0d8..79a7f21 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -4,8 +4,8 @@ on: [push, pull_request, workflow_dispatch] env: ENDPOINT: "linuxserver/mods" #don't modify - BASEIMAGE: "replace_baseimage" #replace - MODNAME: "replace_modname" #replace + BASEIMAGE: "nextcloud" #replace + MODNAME: "mediadc" #replace jobs: build: diff --git a/root/etc/cont-init.d/98-mediadc-dependency-install b/root/etc/cont-init.d/98-mediadc-dependency-install new file mode 100644 index 0000000..6536ee6 --- /dev/null +++ b/root/etc/cont-init.d/98-mediadc-dependency-install @@ -0,0 +1,32 @@ +#!/usr/bin/with-contenv bash + +echo "**** Installing required packages ****" + +apk add --no-cache \ + ffmpeg \ + imagemagick \ + supervisor \ + py3-numpy \ + py3-pillow \ + py3-asn1crypto; + +echo "**** Installing optional packages ****" + +apk add --no-cache \ + py3-cffi \ + py3-scipy \ + py3-pynacl \ + py3-cryptography \ + py3-pip; + + +python3 -m pip install -U pip + + +python3 -m pip install pillow_heif + + +echo "**** Installing pywavelets if architecture is not ARM ****" + +arch=$(arch | sed s/x86_64/amd64/) && \ + python3 -m pip install pywavelets \ No newline at end of file diff --git a/root/etc/cont-init.d/98-vpn-config b/root/etc/cont-init.d/98-vpn-config deleted file mode 100644 index a5f9127..0000000 --- a/root/etc/cont-init.d/98-vpn-config +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/with-contenv bash - -# Determine if setup is needed -if [ ! -f /usr/local/lib/python***/dist-packages/sshuttle ] && \ -[ -f /usr/bin/apt ]; then - ## Ubuntu - apt-get update - apt-get install --no-install-recommends -y \ - iptables \ - openssh-client \ - python3 \ - python3-pip - pip3 install sshuttle -fi -if [ ! -f /usr/lib/python***/site-packages/sshuttle ] && \ -[ -f /sbin/apk ]; then - # Alpine - apk add --no-cache \ - iptables \ - openssh \ - py3-pip \ - python3 - pip3 install sshuttle -fi - -chown -R root:root /root -chmod -R 600 /root/.ssh diff --git a/root/etc/services.d/sshvpn/run b/root/etc/services.d/sshvpn/run deleted file mode 100644 index 7d49e79..0000000 --- a/root/etc/services.d/sshvpn/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/with-contenv bash - -sshuttle --dns --remote root@${HOST}:${PORT} 0/0 -x 172.17.0.0/16