From 023b04b32a47bb6c5803a10bafebd3619840b854 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 10 Dec 2020 12:02:41 +0100 Subject: [PATCH] test code-server, remove beets --- beets/Dockerfile | 10 --- beets/build.json | 14 ---- beets/config.json | 45 ----------- code-server/Dockerfile | 7 ++ {beets => code-server}/README.md | 0 code-server/build.json | 14 ++++ code-server/config.json | 38 ++++++++++ {beets => code-server}/icon.png | Bin {beets => code-server}/logo.png | Bin .../root/etc/cont-init.d/50-mounts | 0 emby/root/etc/cont-init.d/00-ha-env | 5 -- emby/root/etc/cont-init.d/20-folders | 70 ------------------ emby/root/etc/cont-init.d/50-mounts | 43 ----------- vscode/config.json | 1 - 14 files changed, 59 insertions(+), 188 deletions(-) delete mode 100644 beets/Dockerfile delete mode 100644 beets/build.json delete mode 100644 beets/config.json create mode 100644 code-server/Dockerfile rename {beets => code-server}/README.md (100%) create mode 100644 code-server/build.json create mode 100644 code-server/config.json rename {beets => code-server}/icon.png (100%) rename {beets => code-server}/logo.png (100%) rename {beets => code-server}/root/etc/cont-init.d/50-mounts (100%) delete mode 100644 emby/root/etc/cont-init.d/00-ha-env delete mode 100644 emby/root/etc/cont-init.d/20-folders delete mode 100644 emby/root/etc/cont-init.d/50-mounts delete mode 100644 vscode/config.json diff --git a/beets/Dockerfile b/beets/Dockerfile deleted file mode 100644 index ffc1d4505..000000000 --- a/beets/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -ARG BUILD_FROM -FROM $BUILD_FROM - -# copy local files -COPY root/ / - -# MOFIFY DATA PATH -RUN sed -i "s|config|data|g" /etc/services.d/beets/run - -VOLUME [ "/data" ] diff --git a/beets/build.json b/beets/build.json deleted file mode 100644 index bb7192d07..000000000 --- a/beets/build.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "build_from_template": { - "image": "linuxserver/beets", - "version": "latest" - }, - "build_from": { - "armv7": "linuxserver/beets:arm32v7-latest", - "armhf": "linuxserver/beets:arm32v7-latest", - "aarch64": "linuxserver/beets:arm64v8-latest", - "amd64": "linuxserver/beets:amd64-latest" - }, - "squash": false, - "args": {} -} diff --git a/beets/config.json b/beets/config.json deleted file mode 100644 index 5b5ad54d2..000000000 --- a/beets/config.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "Beets", - "version": "1.0", - "slug": "beets", - "description": "Beets is a music library manager and not, for the most part, a music player.", - "url": "https://github.com/alexbelgium/hassio-addons/doublecommander", - "startup": "services", - "arch": [ - "aarch64", - "amd64", - "armv7", - "armhf" - ], - "ports": { - "8337/tcp": 8337 - }, - "map": [ - "backup:rw", - "config:rw", - "share:rw", - "media:rw", - "ssl" - ], - "webui": "http://[HOST]:[PORT:8337]", - "boot": "auto", - "privileged": ["SYS_ADMIN", "DAC_READ_SEARCH"], - "full_access": true, - "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" - } - } diff --git a/code-server/Dockerfile b/code-server/Dockerfile new file mode 100644 index 000000000..1859209b4 --- /dev/null +++ b/code-server/Dockerfile @@ -0,0 +1,7 @@ +ARG BUILD_FROM +FROM $BUILD_FROM + +# MOFIFY DATA PATH +RUN sed -i "s|config|data|g" /etc/services.d/code-server/run + +VOLUME [ "/data" ] diff --git a/beets/README.md b/code-server/README.md similarity index 100% rename from beets/README.md rename to code-server/README.md diff --git a/code-server/build.json b/code-server/build.json new file mode 100644 index 000000000..b919e39f9 --- /dev/null +++ b/code-server/build.json @@ -0,0 +1,14 @@ +{ + "build_from_template": { + "image": "linuxserver/code-server", + "version": "latest" + }, + "build_from": { + "armv7": "linuxserver/code-server:arm32v7-latest", + "armhf": "linuxserver/code-server:arm32v7-latest", + "aarch64": "linuxserver/code-server:arm64v8-latest", + "amd64": "linuxserver/code-server:amd64-latest" + }, + "squash": false, + "args": {} +} diff --git a/code-server/config.json b/code-server/config.json new file mode 100644 index 000000000..fd59a5cf3 --- /dev/null +++ b/code-server/config.json @@ -0,0 +1,38 @@ +{ + "name": "VS code", + "version": "1.°", + "slug": "code-server", + "description": "Double Commander is a free cross platform open source file manager with two panels side by side.", + "url": "https://github.com/alexbelgium/hassio-addons/code-server", + "startup": "services", + "arch": [ + "aarch64", + "amd64", + "armv7", + "armhf" + ], + "ports": { + "8443/tcp": 8443 + }, + "map": [ + "backup:rw", + "config:rw", + "share:rw", + "media:rw", + "ssl" + ], + "webui": "http://[HOST]:[PORT:3000]", + "environment": { + "PUID": "0", + "PGID": "0" + }, + "options": { + "PUID": "0", + "PGID": "0" + }, + "schema": { + "PUID": "int", + "PGID": "int", + "TZ": "str?" + } +} diff --git a/beets/icon.png b/code-server/icon.png similarity index 100% rename from beets/icon.png rename to code-server/icon.png diff --git a/beets/logo.png b/code-server/logo.png similarity index 100% rename from beets/logo.png rename to code-server/logo.png diff --git a/beets/root/etc/cont-init.d/50-mounts b/code-server/root/etc/cont-init.d/50-mounts similarity index 100% rename from beets/root/etc/cont-init.d/50-mounts rename to code-server/root/etc/cont-init.d/50-mounts diff --git a/emby/root/etc/cont-init.d/00-ha-env b/emby/root/etc/cont-init.d/00-ha-env deleted file mode 100644 index 3b3e69246..000000000 --- a/emby/root/etc/cont-init.d/00-ha-env +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/with-contenv bashio - -for k in $(bashio::jq "${__BASHIO_ADDON_CONFIG}" 'keys | .[]'); do - printf "$(bashio::config $k)" > /var/run/s6/container_environment/$k -done \ No newline at end of file diff --git a/emby/root/etc/cont-init.d/20-folders b/emby/root/etc/cont-init.d/20-folders deleted file mode 100644 index b5a4b3649..000000000 --- a/emby/root/etc/cont-init.d/20-folders +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/with-contenv bash - -if [ ! -d /emby ]; then - echo "Creating /emby" - mkdir -p /emby - chown -R abc:abc /emby -fi - -if [ ! -d /share/emby ]; then - echo "Creating /share/emby" - mkdir -p /share/emby - chown -R abc:abc /share/emby -fi - -if [ ! -d /config/emby ]; then - echo "Creating /config/emby" - mkdir -p /config/emby - chown -R abc:abc /config/emby -fi - -# links - -if [ ! -d /emby/cache ]; then - echo "Creating link for /emby/cache" - mkdir -p /share/emby/cache - chown -R abc:abc /share/emby/cache - ln -s /share/emby/cache /emby/cache -fi - -if [ ! -d /emby/config ]; then - echo "Creating link for /emby/config" - mkdir -p /config/emby - chown -R abc:abc /config/emby - ln -s /config/emby /emby/config -fi - -if [ ! -d /emby/data ]; then - echo "Creating link for /emby/data" - mkdir -p /share/emby/data - chown -R abc:abc /share/emby/data - ln -s /share/emby/data /emby/data -fi - -if [ ! -d /emby/logs ]; then - echo "Creating link for /emby/logs" - mkdir -p /share/emby/logs - chown -R abc:abc /share/emby/logs - ln -s /share/emby/logs /emby/logs -fi - -if [ ! -d /emby/metadata ]; then - echo "Creating link for /emby/metadata" - mkdir -p /share/emby/metadata - chown -R abc:abc /share/emby/metadata - ln -s /share/emby/metadata /emby/metadata -fi - -if [ ! -d /emby/plugins ]; then - echo "Creating link for /emby/plugins" - mkdir -p /share/emby/plugins - chown -R abc:abc /share/emby/plugins - ln -s /share/emby/plugins /emby/plugins -fi - -if [ ! -d /emby/root ]; then - echo "Creating link for /emby/root" - mkdir -p /share/emby/root - chown -R abc:abc /share/emby/root - ln -s /share/emby/root /emby/root -fi diff --git a/emby/root/etc/cont-init.d/50-mounts b/emby/root/etc/cont-init.d/50-mounts deleted file mode 100644 index e7fb49d35..000000000 --- a/emby/root/etc/cont-init.d/50-mounts +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/with-contenv bashio -bashio::log.info 'Mounting external hdd...' - -# Mount local Share if configured and if Protection Mode is active -if bashio::config.has_value 'localdisks'; then - MOREDISKS=$(bashio::config 'localdisks') - bashio::log.info "Local Disks mounting.. ${MOREDISKS}" && \ - for disk in $MOREDISKS - do - bashio::log.info "Mount ${disk}" - mkdir -p /share/$disk && \ - if [ ! -d /share/$disk ]; then - echo "Creating /share/$disk" - mkdir -p /share/$disk - chown -R abc:abc /share/$disk - fi - mount /dev/$disk /share/$disk && \ - bashio::log.info "Success!" - done || \ - bashio::log.warning "Protection mode is ON. Unable to mount local drives!" -fi - -# Mount CIFS Share if configured and if Protection Mode is active -if bashio::config.has_value 'networkdisks'; then - MOREDISKS=$(bashio::config 'networkdisks') - CIFS_USERNAME=$(bashio::config 'cifsusername') - CIFS_PASSWORD=$(bashio::config 'cifspassword') - bashio::log.info "Network Disks mounting.. ${MOREDISKS}" && \ - 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!" - done || \ - bashio::log.warning "Protection mode is ON. Unable to mount external drives!" -fi diff --git a/vscode/config.json b/vscode/config.json deleted file mode 100644 index 8b1378917..000000000 --- a/vscode/config.json +++ /dev/null @@ -1 +0,0 @@ -