diff --git a/.docker/ungoogled-chromium/Dockerfile b/.docker/ungoogled-chromium/Dockerfile index 86716a8..af21521 100644 --- a/.docker/ungoogled-chromium/Dockerfile +++ b/.docker/ungoogled-chromium/Dockerfile @@ -5,6 +5,7 @@ ARG API_URL="https://api.github.com/repos/macchrome/linchrome/releases/latest" # # install custom chromium build from woolyss with support for hevc/x265 +SHELL ["/bin/bash", "-c"] RUN set -eux; apt-get update; \ apt-get install -y --no-install-recommends wget unzip libatk1.0-0 libatk-bridge2.0-0 libatomic1 \ libcups2 libgtk-3-0 libnss3 libpci3 libxcomposite1 libxss1 openbox xz-utils jq; \ @@ -21,11 +22,27 @@ RUN set -eux; apt-get update; \ # # install widevine module WIDEVINE_VERSION=$(wget --quiet -O - https://dl.google.com/widevine-cdm/versions.txt | tail -n 1); \ - wget -O /tmp/widevine.zip "https://dl.google.com/widevine-cdm/$WIDEVINE_VERSION-linux-x64.zip"; \ + wget -O /tmp/widevine.zip "https://dl.google.com/widevine-cdm/${WIDEVINE_VERSION}-linux-x64.zip"; \ unzip -p /tmp/widevine.zip libwidevinecdm.so > /usr/lib/chromium/libwidevinecdm.so; \ chmod 644 /usr/lib/chromium/libwidevinecdm.so; \ rm /tmp/widevine.zip; \ # + # install latest version of uBlock Origin and SponsorBlock for YouTube + CHROMIUM_VERSION="$(wget -O - "${API_URL}" 2>/dev/null | jq -r ".tag_name" | sed -e 's/v//' -e 's/-.*//')"; \ + EXTENSIONS_DIR="/usr/share/chromium/extensions"; \ + EXTENSIONS=( \ + cjpalhdlnbpafiamejdnhcphjbkeiagm \ + mnjggcdmjocbbbhaepdhchncahnbgone \ + ); \ + mkdir -p "${EXTENSIONS_DIR}"; \ + for EXT_ID in "${EXTENSIONS[@]}"; \ + do \ + EXT_URL="https://clients2.google.com/service/update2/crx?response=redirect&nacl_arch=x86-64&prodversion=${CHROMIUM_VERSION}&acceptformat=crx2,crx3&x=id%3D${EXT_ID}%26installsource%3Dondemand%26uc"; \ + EXT_PATH="${EXTENSIONS_DIR}/${EXT_ID}.crx"; \ + wget -O "${EXT_PATH}" "${EXT_URL}"; \ + EXT_VERSION="$(unzip -p "${EXT_PATH}" manifest.json 2>/dev/null | jq -r ".version")"; \ + echo -e "{\n \"external_crx\": \"${EXT_PATH}\",\n \"external_version\": \"${EXT_VERSION}\"\n}" > "${EXTENSIONS_DIR}"/"${EXT_ID}".json; \ + done; \ # clean up apt-get --purge autoremove -y xz-utils jq; \ apt-get clean -y; \ @@ -37,7 +54,3 @@ COPY supervisord.conf /etc/neko/supervisord/ungoogled-chromium.conf COPY preferences.json /usr/lib/chromium/master_preferences COPY policies.json /etc/chromium/policies/managed/policies.json COPY openbox.xml /etc/neko/openbox.xml - -# -# copy extensions and policy files -COPY extensions /usr/share/chromium/extensions diff --git a/.docker/ungoogled-chromium/extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm.crx b/.docker/ungoogled-chromium/extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm.crx deleted file mode 100644 index 69081a0..0000000 Binary files a/.docker/ungoogled-chromium/extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm.crx and /dev/null differ diff --git a/.docker/ungoogled-chromium/extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm.json b/.docker/ungoogled-chromium/extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm.json deleted file mode 100644 index f2bfef7..0000000 --- a/.docker/ungoogled-chromium/extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "external_crx": "/usr/share/chromium/extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm.crx", - "external_version": "1.42.4" -} diff --git a/.docker/ungoogled-chromium/extensions/mnjggcdmjocbbbhaepdhchncahnbgone.crx b/.docker/ungoogled-chromium/extensions/mnjggcdmjocbbbhaepdhchncahnbgone.crx deleted file mode 100644 index a1e657d..0000000 Binary files a/.docker/ungoogled-chromium/extensions/mnjggcdmjocbbbhaepdhchncahnbgone.crx and /dev/null differ diff --git a/.docker/ungoogled-chromium/extensions/mnjggcdmjocbbbhaepdhchncahnbgone.json b/.docker/ungoogled-chromium/extensions/mnjggcdmjocbbbhaepdhchncahnbgone.json deleted file mode 100644 index 9648498..0000000 --- a/.docker/ungoogled-chromium/extensions/mnjggcdmjocbbbhaepdhchncahnbgone.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "external_crx": "/usr/share/chromium/extensions/mnjggcdmjocbbbhaepdhchncahnbgone.crx", - "external_version": "4.5.1" -}