Merge branch 'feature/update-format' into develop

jackett-sonarr-radarr/docker-compose.yml

@@ -1,40 +1,49 @@
-version: '3'
+version: "3"
+
 services:
   jackett:
-    image: "linuxserver/jackett"
+    image: linuxserver/jackett
+    container_name: jackett
     ports:
-      - "10.8.0.1:9117:9117"
+      - 9117:9117
     environment:
-      PGID: "1000"
-      PUID: "1000"
-      TZ: "Europe/Madrid"
+      PGID: 1000
+      PUID: 1000
+      TZ: Europe/Madrid
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ./config/jackett:/config
       - ./downloads/jackett:/downloads
+    restart: unless-stopped
+
   sonarr:
-    image: "linuxserver/sonarr"
+    image: linuxserver/sonarr
+    container_name: sonarr
     ports:
-      - "10.8.0.1:8989:8989"
+      - 8989:8989
     environment:
-      PGID: "1000"
-      PUID: "1000"
-      TZ: "Europe/Madrid"
+      PGID: 1000
+      PUID: 1000
+      TZ: Europe/Madrid
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ./config/sonarr:/config
       - ../kodi/media/series:/tv
       - ../transmission/downloads/complete:/downloads
+    restart: unless-stopped
+
   radarr:
-    image: "linuxserver/radarr"
+    image: linuxserver/radarr
+    container_name: radarr
     ports:
-      - "10.8.0.1:7878:7878"
+      - 7878:7878
     environment:
-      PGID: "1000"
-      PUID: "1000"
-      TZ: "Europe/Madrid"
+      PGID: 1000
+      PUID: 1000
+      TZ: Europe/Madrid
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ./config/radarr:/config
       - ../kodi/media/movies:/movies
       - ../transmission/downloads/complete:/downloads
+    restart: unless-stopped

jackett/docker-compose.yml

@@ -1,14 +1,17 @@
-version: '3'
+version: "3"
+
 services:
   jackett:
-    image: "linuxserver/jackett"
+    image: linuxserver/jackett
+    container_name: jackett
     ports:
-      - "10.8.0.1:9117:9117"
+      - 9117:9117
     environment:
-      PGID: "1000"
-      PUID: "1000"
-      TZ: "Europe/Madrid"
+      PGID: 1000
+      PUID: 1000
+      TZ: Europe/Madrid
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ./config:/config
       - ./downloads:/downloads
+    restart: unless-stopped

jenkins/docker-compose.yml

@@ -1,10 +1,14 @@
-jenkins:
-  image: jenkins/jenkins:lts-alpine
-  ports:
-    - "8080:8080"
-    - "50000:50000"
-  volumes:
-    - ./data:/var/jenkins_home
-  environment:
-    - JAVA_OPTS=-Dhudson.footerURL=http://mycompany.io
-  restart: always
+version: "3"
+
+services:
+  jenkins:
+    image: jenkins/jenkins:lts-alpine
+    container_name: jenkins
+    ports:
+      - 8080:8080
+      - 50000:50000
+    volumes:
+      - ./data:/var/jenkins_home
+    environment:
+      - JAVA_OPTS=-Dhudson.footerURL=http://mycompany.io
+    restart: unless-stopped

kodi/docker-compose.yml

@@ -1,14 +1,17 @@
-version: '3'
+version: "3"
+
 services:
   kodi:
-    image: "linuxserver/kodi-headless"
+    image: linuxserver/kodi-headless
+    container_name: kodi
     ports:
-      - "10.8.0.1:8080:8080"
-      - "10.8.0.1:9777:9777/udp"
+      - 8080:8080
+      - 9777:9777/udp
     environment:
       PUID: 1000
       PGID: 1000
-      TZ: "Europe/Madrid"
+      TZ: Europe/Madrid
     volumes:
       - ./config/.kodi:/config/.kodi
       - ./media:/media
+    restart: unless-stopped

kodi/scripts/cleanLibrary.sh

@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # video library clean
-curl --data-binary '{ "jsonrpc": "2.0", "method": "VideoLibrary.Clean", "id": "mybash"}' -H 'content-type: application/json;' http://10.8.0.1:8080/jsonrpc
+curl --data-binary '{ "jsonrpc": "2.0", "method": "VideoLibrary.Clean", "id": "mybash"}' -H 'content-type: application/json;' http://127.0.0.1:8080/jsonrpc
 # audio library clean
-curl --data-binary '{ "jsonrpc": "2.0", "method": "AudioLibrary.Clean", "id": "mybash"}' -H 'content-type: application/json;' http://10.8.0.1:8080/jsonrpc
+curl --data-binary '{ "jsonrpc": "2.0", "method": "AudioLibrary.Clean", "id": "mybash"}' -H 'content-type: application/json;' http://127.0.0.1:8080/jsonrpc

kodi/scripts/library.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # crontab script
 # m h  dom mon dow   command

kodi/scripts/updateLibrary.sh

@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # video library scan
-curl --data-binary '{ "jsonrpc": "2.0", "method": "VideoLibrary.Scan", "id": "mybash"}' -H 'content-type: application/json;' http://10.8.0.1:8080/jsonrpc
+curl --data-binary '{ "jsonrpc": "2.0", "method": "VideoLibrary.Scan", "id": "mybash"}' -H 'content-type: application/json;' http://127.0.0.1:8080/jsonrpc
 # audio library scan
-curl --data-binary '{ "jsonrpc": "2.0", "method": "AudioLibrary.Scan", "id": "mybash"}' -H 'content-type: application/json;' http://10.8.0.1:8080/jsonrpc
+curl --data-binary '{ "jsonrpc": "2.0", "method": "AudioLibrary.Scan", "id": "mybash"}' -H 'content-type: application/json;' http://127.0.0.1:8080/jsonrpc

pihole/docker-compose.yml

@@ -3,25 +3,25 @@ version: "3"
 # More info at https://github.com/pi-hole/docker-pi-hole/ and https://docs.pi-hole.net/
 services:
   pihole:
-    container_name: pihole
     image: pihole/pihole:latest
+    container_name: pihole
     ports:
-      - "53:53/tcp"
-      - "53:53/udp"
-      - "67:67/udp"
-      - "80:80/tcp"
-      - "443:443/tcp"
+      - 53:53/tcp
+      - 53:53/udp
+      - 67:67/udp
+      - 80:80/tcp
+      - 443:443/tcp
     environment:
-      TZ: "Europe/Madrid"
-      WEBPASSWORD: "foobaz"
+      TZ: Europe/Madrid
+      WEBPASSWORD: foobaz
     volumes:
-      - "./etc-pihole/:/etc/pihole/"
-      - "./etc-dnsmasq.d/:/etc/dnsmasq.d/"
+      - ./etc-pihole/:/etc/pihole/
+      - ./etc-dnsmasq.d/:/etc/dnsmasq.d/
     dns:
       - 127.0.0.1
       - 1.1.1.1
     # Recommended but not required (DHCP needs NET_ADMIN)
     #   https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
-    cap_add:
-      - NET_ADMIN
+    # cap_add:
+    #   - NET_ADMIN
     restart: unless-stopped

radarr/docker-compose.yml

@@ -1,15 +1,18 @@
-version: '3'
+version: "3"
+
 services:
   radarr:
-    image: "linuxserver/radarr"
+    image: linuxserver/radarr
+    container_name: radarr
     ports:
-      - "10.8.0.1:7878:7878"
+      - 7878:7878
     environment:
-      PGID: "1000"
-      PUID: "1000"
-      TZ: "Europe/Madrid"
+      PGID: 1000
+      PUID: 1000
+      TZ: Europe/Madrid
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ./config:/config
       - ../kodi/media/movies:/movies
       - ../transmission/downloads/complete:/downloads
+    restart: unless-stopped

sonarr/docker-compose.yml

@@ -1,15 +1,18 @@
-version: '3'
+version: "3"
+
 services:
   sonarr:
-    image: "linuxserver/sonarr"
+    image: linuxserver/sonarr
+    container_name: sonarr
     ports:
-      - "10.8.0.1:8989:8989"
+      - 8989:8989
     environment:
-      PGID: "1000"
-      PUID: "1000"
-      TZ: "Europe/Madrid"
+      PGID: 1000
+      PUID: 1000
+      TZ: Europe/Madrid
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ./config:/config
       - ../kodi/media/series:/tv
       - ../transmission/downloads/complete:/downloads
+    restart: unless-stopped

syncthing/docker-compose.yml

@@ -4,15 +4,16 @@ services:
   syncthing:
     image: linuxserver/syncthing:latest
     container_name: syncthing
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Madrid
-      - UMASK_SET=022
-    volumes:
-      - ./config:/config
-      - ./data:/data
     ports:
       - 8384:8384
       - 22000:22000
       - 21027:21027/udp
+    environment:
+      PUID: 1000
+      PGID: 1000
+      TZ: Europe/Madrid
+      UMASK_SET: 022
+    volumes:
+      - ./config:/config
+      - ./data:/data
+    restart: unless-stopped

tor/docker-compose.yml

@@ -1,16 +1,22 @@
-version: '3'
+version: "3"
+
 services:
   tor-es:
-    image: "dperson/torproxy"
+    image: dperson/torproxy
+    container_name: tor-es
     ports:
-      - "10.8.0.1:8118:8118"
-      - "10.8.0.1:9050:9050"
+      - 8118:8118
+      - 9050:9050
     environment:
-      LOCATION: "ES"
+      LOCATION: ES
+    restart: unless-stopped
+
   tor-us:
-    image: "dperson/torproxy"
+    image: dperson/torproxy
+    container_name: tor-us
     ports:
-      - "10.8.0.1:8119:8118"
-      - "10.8.0.1:9051:9050"
+      - 8119:8118
+      - 9051:9050
     environment:
-      LOCATION: "US"
+      LOCATION: US
+    restart: unless-stopped

transmission/docker-compose.yml

@@ -1,16 +1,19 @@
-version: '3'
+version: "3"
+
 services:
   transmission:
-    image: "linuxserver/transmission"
+    image: linuxserver/transmission
+    container_name: transmission
     ports:
-      - "10.8.0.1:9091:9091"
-      - "51213:51213"
-      - "51213:51213/udp"
+      - 9091:9091
+      - 51213:51213
+      - 51213:51213/udp
     environment:
-      PGID: "1000"
-      PUID: "1000"
-      TZ: "Europe/Madrid"
+      PGID: 1000
+      PUID: 1000
+      TZ: Europe/Madrid
     volumes:
       - ./config:/config
       - ./downloads:/downloads
       - ./watch:/watch
+    restart: unless-stopped

youtube-dl/docker-compose.yml

@@ -1,6 +1,8 @@
-version: '3'
+version: "3"
+
 services:
   youtube-dl:
-    image: "kijart/youtube-dl"
+    image: kijart/youtube-dl
+    container_name: youtube-dl
     volumes:
       - .:/media