diff --git a/doublecommander/CHANGELOG.md b/doublecommander/CHANGELOG.md deleted file mode 100644 index cb9396a86..000000000 --- a/doublecommander/CHANGELOG.md +++ /dev/null @@ -1,4 +0,0 @@ -## 0.8.2-1-ls41 -- Update to latest version from linuxserver/docker-doublecommander - -- Enables PUID/GUID options diff --git a/doublecommander/Dockerfile b/doublecommander/Dockerfile deleted file mode 100644 index cef8d7bfd..000000000 --- a/doublecommander/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -ARG BUILD_FROM -ARG BUILD_VERSION - -FROM ${BUILD_FROM}${BUILD_VERSION} - -# Install bashio -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - jq \ - && curl -J -L -o /tmp/bashio.tar.gz \ - "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \ - && mkdir /tmp/bashio \ - && tar zxvf \ - /tmp/bashio.tar.gz \ - --strip 1 -C /tmp/bashio \ - \ - && mv /tmp/bashio/lib /usr/lib/bashio \ - && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \ - && rm -fr \ - /tmp/* \ - /var/{cache,log}/* \ - /var/lib/apt/lists/* \ - # Allow UID and GID setting - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser - -# copy local files -COPY root/ / - -# MOFIFY DATA PATH -RUN sed -i "s|config|data|g" /defaults/autostart - -VOLUME [ "/data" ] diff --git a/doublecommander/README.md b/doublecommander/README.md deleted file mode 100644 index 32fb67a28..000000000 --- a/doublecommander/README.md +++ /dev/null @@ -1,32 +0,0 @@ -# Home assistant add-on: doublecommander -![Supports aarch64 Architecture][aarch64-shield] ![Supports amd64 Architecture][amd64-shield] ![Supports armhf Architecture][armhf-shield] ![Supports armv7 Architecture][armv7-shield] - -## About - -Double Commander is a free cross platform open source file manager with two panels side by side. It is inspired by Total Commander and features some new ideas. - -This addon is based on the [docker image](https://github.com/linuxserver/docker-doublecommander) from linuxserver.io. - -## Installation - -The installation of this add-on is pretty straightforward and not different in -comparison to installing any other Hass.io add-on. - -1. [Add my Hass.io add-ons repository][repository] to your Hass.io instance. -1. Install this add-on. -1. Click the `Save` button to store your configuration. -1. Start the add-on. -1. Check the logs of the add-on to see if everything went well. -1. Carefully configure the add-on to your preferences, see the official documentation for for that. - - -## Configuration - -Webui can be found at `:3000`. - - -[repository]: https://github.com/alexbelgium/hassio-addons -[aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg -[amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg -[armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg -[armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg diff --git a/doublecommander/build.json b/doublecommander/build.json deleted file mode 100644 index efa69b319..000000000 --- a/doublecommander/build.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "build_from": { - "armv7": "linuxserver/doublecommander:arm32v7-", - "armhf": "linuxserver/doublecommander:arm32v7-", - "aarch64": "linuxserver/doublecommander:arm64v8-", - "amd64": "linuxserver/doublecommander:amd64-" - }, - "squash": false, - "args": {} -} diff --git a/doublecommander/config.json b/doublecommander/config.json deleted file mode 100644 index 13644a596..000000000 --- a/doublecommander/config.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "name": "Double commander", - "version": "0.8.2-1-ls41", - "slug": "doublecommander", - "description": "Double Commander is a free cross platform open source file manager with two panels side by side.", - "url": "https://hub.docker.com/r/linuxserver/doublecommander", - "startup": "services", - "arch": [ - "aarch64", - "amd64", - "armv7", - "armhf" - ], - "ports": { - "3000/tcp": 3000 - }, - "map": [ - "backup:rw", - "config:rw", - "share:rw", - "media:rw", - "ssl" - ], - "webui": "http://[HOST]:[PORT:3000]", - "boot": "auto", - "privileged": [ - "SYS_ADMIN", - "DAC_READ_SEARCH" - ], - "host_network": true, - "full_access": true, - "environment": { - "PUID": "0", - "PGID": "0" - }, - "options": { - "PUID": 0, - "PGID": 0, - "localdisks": [ - "sda1" - ], - "networkdisks": "", - "cifsusername": "", - "cifspassword": "" - }, - "schema": { - "PUID": "int", - "PGID": "int", - "TZ": "str?", - "localdisks": [ - "str" - ], - "networkdisks": "str", - "cifsusername": "str", - "cifspassword": "str" - } -} \ No newline at end of file diff --git a/doublecommander/icon.png b/doublecommander/icon.png deleted file mode 100644 index 6a349d9a1..000000000 Binary files a/doublecommander/icon.png and /dev/null differ diff --git a/doublecommander/logo.png b/doublecommander/logo.png deleted file mode 100644 index 6a349d9a1..000000000 Binary files a/doublecommander/logo.png and /dev/null differ diff --git a/filebrowser/CHANGELOG.md b/filebrowser/CHANGELOG.md new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/filebrowser/CHANGELOG.md @@ -0,0 +1 @@ + diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile new file mode 100644 index 000000000..6a33cbbac --- /dev/null +++ b/filebrowser/Dockerfile @@ -0,0 +1,25 @@ +ARG BUILD_VERSION +FROM hurlenko/filebrowser:$BUILD_VERSION + +# Copy root filesystem +COPY rootfs / + +RUN apk add --no-cache \ + curl \ + jq \ + && curl -J -L -o /tmp/bashio.tar.gz \ + "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \ + && mkdir /tmp/bashio \ + && tar zxvf \ + /tmp/bashio.tar.gz \ + --strip 1 -C /tmp/bashio \ + \ + && mv /tmp/bashio/lib /usr/lib/bashio \ + && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \ + && rm -fr /tmp/bashio.tar.gz\ + \ + && mkdir -p -m 777 /config/filebrowser + +VOLUME [ "/data" ] + +CMD ["--root=/data", "--address=0.0.0.0", "--database=/config/filebrowser/filebrowser.db"] \ No newline at end of file diff --git a/filebrowser/README.md b/filebrowser/README.md new file mode 100644 index 000000000..d66b8ac2e --- /dev/null +++ b/filebrowser/README.md @@ -0,0 +1,48 @@ +# Home assistant add-on: qBittorrent +![Supports aarch64 Architecture][aarch64-shield] ![Supports amd64 Architecture][amd64-shield] ![Supports armhf Architecture][armhf-shield] ![Supports armv7 Architecture][armv7-shield] + +## About + +Transmission is a bittorrent client. +This addon is based on the [docker image](https://github.com/linuxserver/qbittorrent) from linuxserver.io. + +## Installation + +The installation of this add-on is pretty straightforward and not different in +comparison to installing any other Hass.io add-on. + +1. [Add my Hass.io add-ons repository][repository] to your Hass.io instance. +1. Install this add-on. +1. Click the `Save` button to store your configuration. +1. Start the add-on. +1. Check the logs of the add-on to see if everything went well. +1. Carefully configure the add-on to your preferences, see the official documentation for for that. + +## Configuration +Webui can be found at . The default username/password : described in the startup log. Configurations can be done through the app, except for the following options. + +Network disk is mounted to /share/storagecifs + +```yaml +GUID: user +GPID: user +ssl: true/false +certfile: fullchain.pem #ssl certificate +keyfile: privkey.pem #sslkeyfile +whitelist: "localhost,192.168.0.0/16" # list ip subnets that won't need a password (optional) +Username: "admin" #username to access webui. Please change it as the default is admin for all installations. +customUI: selection from list # alternative webUI can be set here. Latest version set at each addon start. +SavePath: "/share/qbittorrent" # Define the download directory +networkdisks: "" # list of smbv2/3 servers to mount (optional) +cifsusername: "username" # smb username (optional) +cifspassword: "password" # smb password (optional) +``` + +## Support +Create an issue on github, or ask on the [home assistant thread](https://community.home-assistant.io/t/home-assistant-addon-qbittorrent/279247) + +[repository]: https://github.com/alexbelgium/hassio-addons +[aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg +[amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg +[armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg +[armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg diff --git a/filebrowser/apparmor.txt b/filebrowser/apparmor.txt new file mode 100644 index 000000000..0e954c3c0 --- /dev/null +++ b/filebrowser/apparmor.txt @@ -0,0 +1,48 @@ +#include + +profile db21ed7f_qbittorrent flags=(attach_disconnected,mediate_deleted) { + #include + + capability, + file, + mount, + umount, + remount, + + capability setgid, + capability setuid, + capability sys_admin, + capability dac_read_search, + # capability dac_override, + # capability sys_rawio, + +# S6-Overlay + /bin/** ix, + /usr/bin/** ix, + /usr/lib/bashio/** ix, + /etc/s6/** rix, + /run/s6/** rix, + /etc/services.d/** rwix, + /etc/cont-init.d/** rwix, + /etc/cont-finish.d/** rwix, + /init rix, + /var/run/** mrwkl, + /var/run/ mrwkl, + /dev/i2c-1 mrwkl, + # Files required + /dev/sda1 mrwkl, + /dev/sdb1 mrwkl, + /dev/mmcblk0p1 mrwkl, + /dev/* mrwkl, + /tmp/** mrkwl, + + # Data access + /data/** rw, + + # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container + ptrace (trace,read) peer=docker-default, + + # docker daemon confinement requires explict allow rule for signal + signal (receive) set=(kill,term) peer=/usr/bin/docker, + +} diff --git a/filebrowser/config.json b/filebrowser/config.json new file mode 100644 index 000000000..c24d3f3c6 --- /dev/null +++ b/filebrowser/config.json @@ -0,0 +1,39 @@ +{ + "name": "Filebrowser", + "version": "2.11.0", + "slug": "filebrowser", + "description": "filebrowser provides a file managing interface within a specified directory and it can be used to upload, delete, preview, rename and edit your files", + "url": "https://github.com/hurlenko/filebrowser-docker", + "startup": "services", + "arch": [ + "aarch64", + "amd64", + "armv7", + "armhf" + ], + "ports": { + "8080/tcp": 8087 + }, + "ports_description": { + "8080/tcp": "Web UI port" + }, + "apparmor": true, + "privileged": ["SYS_ADMIN", "DAC_READ_SEARCH"], + "map": [ + "media:rw", + "config:rw", + "share:rw", + "ssl" + ], + "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]", + "environment": { + "FB_BASEURL": "/filebrowser" + }, + "options": { + }, + "schema": { + "networkdisks": "str?", + "cifsusername": "str?", + "cifspassword": "str?" + } +} diff --git a/filebrowser/icon.png b/filebrowser/icon.png new file mode 100644 index 000000000..40d673f69 Binary files /dev/null and b/filebrowser/icon.png differ diff --git a/filebrowser/logo.png b/filebrowser/logo.png new file mode 100644 index 000000000..40d673f69 Binary files /dev/null and b/filebrowser/logo.png differ diff --git a/doublecommander/root/etc/cont-init.d/50-mounts b/filebrowser/rootfs/etc/cont-init.d/92-mounts similarity index 71% rename from doublecommander/root/etc/cont-init.d/50-mounts rename to filebrowser/rootfs/etc/cont-init.d/92-mounts index e7fb49d35..5b3d45ba2 100644 --- a/doublecommander/root/etc/cont-init.d/50-mounts +++ b/filebrowser/rootfs/etc/cont-init.d/92-mounts @@ -1,8 +1,11 @@ #!/usr/bin/with-contenv bashio -bashio::log.info 'Mounting external hdd...' +###################### +# MOUNT LOCAL SHARES # +###################### # Mount local Share if configured and if Protection Mode is active if bashio::config.has_value 'localdisks'; then + bashio::log.info 'Mounting external hdd...' MOREDISKS=$(bashio::config 'localdisks') bashio::log.info "Local Disks mounting.. ${MOREDISKS}" && \ for disk in $MOREDISKS @@ -20,8 +23,12 @@ if bashio::config.has_value 'localdisks'; then bashio::log.warning "Protection mode is ON. Unable to mount local drives!" fi +#################### +# MOUNT SMB SHARES # +#################### # Mount CIFS Share if configured and if Protection Mode is active if bashio::config.has_value 'networkdisks'; then + bashio::log.info 'Mounting smb share...' MOREDISKS=$(bashio::config 'networkdisks') CIFS_USERNAME=$(bashio::config 'cifsusername') CIFS_PASSWORD=$(bashio::config 'cifspassword') @@ -29,15 +36,11 @@ if bashio::config.has_value 'networkdisks'; then for disk in $MOREDISKS do bashio::log.info "Mount ${disk}" - mkdir -p /share/storagecifs && \ - if [ ! -d /storage/storagecifs ]; then - echo "Creating /storage/storagecifs" - mkdir -p /storage/storagecifs - chown -R abc:abc /storage/storagecifs - fi - - mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD $disk /storage/storagecifs && \ - bashio::log.info "Success!" + echo "Creating /storage/storagecifs" + mkdir -p /storage/storagecifs + chown -R abc:abc /storage/storagecifs + mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD $disk /storage/storagecifs && \ + bashio::log.info "Success!" done || \ bashio::log.warning "Protection mode is ON. Unable to mount external drives!" fi