Skip to content

Commit

Permalink
several organizational changes to simplify development and releasees
Browse files Browse the repository at this point in the history
  • Loading branch information
anandslab committed Nov 29, 2024
1 parent 5e55ffe commit b1d3209
Show file tree
Hide file tree
Showing 224 changed files with 851 additions and 128 deletions.
28 changes: 14 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
*
*/

!deployarr_v5.3.app
!deployarr_v5.3-arm.app

!.gitignore
!README.md
!CHANGELOG.md
!LICENSE
!announcement
!CHANGELOG.md
!latest-version
!deployarr_v4.6.1.app
!deployarr_v4.6.1-arm.app
!deployarr_v5.0.app
!deployarr_v5.0-arm.app
!APPS.md
!v4-to-v5-migration.md
!LICENSE
!README.md

!compose
compose/*
!compose/*.yml

!scripts
scripts/*
!scripts/*.sh
!docs
docs/*
!docs/*.md

!images
!images/*
Expand All @@ -30,6 +27,10 @@ scripts/*
!includes/*
!includes/*/*

!scripts
scripts/*
!scripts/*.sh

!archives
archives/*
!archives/deployarr_v4
Expand All @@ -42,5 +43,4 @@ archives/deployarr_v4/compose/*
!archives/deployarr_v4/includes/*/*
!archives/deployarr_v4/scripts
archives/deployarr_v4/scripts/*
!archives/deployarr_v4/scripts/*.sh

!archives/deployarr_v4/scripts/*.sh
35 changes: 34 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,37 @@
<h3>Releases</h3>

<h5>v5.2 - November 7, 2024</h5>
Total Supported Apps: 101
<ul>
<li>NEW: Added DigiKam, Redis Commander, PHotoshow, Node Exporter, Funkwhale, Gonic, GPTWOL, CrowdSec, and CrowdSec Firewall Bouncer.</li>
<li>ENHANCEMENT: Deployarr PIN now saved locally and shown in About menu, in case you forget. To change it, just reset it.</li>
<li>FIX: DWEEBUI_SECRET not found error.</li>
<li>Other minor improvements and fixes.</li>
<li>Next few releases will focus on stability (e.g. on Debian 12) and improvements (e.g. Guacamole).</li>
</ul>

<h5>v5.1 - October 30, 2024</h5>
Total Supported Apps: 91
<ul>
<li>NEW: Added DweebUI, Cloud Commander, Double Commander, Theme Park, Notifiarr, Flaresolverr, ESPHome, Emby, Dockwatch, Lollypop, qBittorrent without VPN, Transmission without VPN, Tailscale, What's Up Docker (WUD), and ZeroTier.</li>
<li>NEW: Changed Plex transcode folder path to match Jellyfin/Emby.</li>
<li>NEW: qBittorrent is now without VPN by default. There is a separate menu item to install it with VPN.</li>
<li>FIX: Bash Aliases was not working with custom Docker Folder.</li>
<li>FIX: Messages after app installation was showing wrong port number in certain situations.</li>
<li>ENHANCEMENT: Improved port availability check. On top of occupied ports on the system, .env will now be checked for ports already defined for other apps.</li>
</ul>

<h5>v5.0.1 - September 30, 2024</h5>
<ul>
<li>FIX: System checks was not being marked as done after completion. Required exiting and relaunching Deployarr.</li>
<li>FIX: Better Rclone remotes detection.</li>
<li>FIX: Rclone installation was failing due to unzip requirement.</li>
<li>FIX: Running the script with sudo failed on Debian due to lack of sudo package by default.</li>
<li>FIX: All apps that required MariaDB databases (Speedtest Tracker, NextCloud, and Gaucamole) failed on migration. Existing databases will now be recognized instead of force creating new ones.</li>
<li>FIX: Traefik will respect existing acme.json file upon migration/reinstallation.</li>
<li>FIX: SSL certificates (acme.json) were being emptied unnecessarily.</li>
</ul>

<h5>v5.0 - September 29, 2024</h5>
Total Supported Apps: 76

Expand All @@ -7,7 +40,7 @@ Total Supported Apps: 76
<li>NEW: Local mode for installing apps for local access only (no reverse proxy). This should now remove the Traefik requirement and allow multi-server setups.</li>
<li>NEW: Traefik Exposure Modes. Simple - all apps behind Traefik accessible internally and externally. Advanced - control over exposing apps internally, externally, or both. </li>
<li>NEW: By default Traefik will use file providers to expose apps via reverse proxy. Previously this was done using Docker labels. Some apps (e.g. Traefik, OAuth, and Authelia), will continue to use labels. </li>
<li>NEW: Autopager - New Homepage based dashboard that auto-populates as you install new apps. It works but will evolve over time.</li>
<li>NEW: Deployarr Dashboard - New Homepage based dashboard that auto-populates as you install new apps. It works but will evolve over time.</li>
<li>NEW: Recommended order of steps for various setups.</li>
<li>NEW: License changes. There are now 3 license types: Basic, Plus, and Pro. Basic allows local-only installs. See License Types description in About menu.</li>
<li>NEW: Deployarr pin reset feature.</li>
Expand Down
2 changes: 1 addition & 1 deletion announcement
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1 +1 @@
\n\Z7 ANNOUNCEMENT: \Zn v4.6.1 is the last version of Deployarr v4. Deployarr v5 is out with several new features that are not backward compatible. See migration info in Deployarr GitHub.\n
\n\Z7 ANNOUNCEMENT: \Zn As of v5.2, Deployarr now supports 101 apps!!!.\n
1 change: 0 additions & 1 deletion compose/adminer.yml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ services:
profiles: ["apps", "all"]
networks:
- default
# - t3_proxy
ports:
- "$ADMINER_PORT:8080"
# DOCKER-LABELS-PLACEHOLDER
1 change: 0 additions & 1 deletion compose/airsonic-advanced.yml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ services:
profiles: ["media", "all"]
networks:
- default
# - t3_proxy
volumes:
- $DOCKERDIR/appdata/airsonic-advanced/podcasts:/data/podcasts
- $DOCKERDIR/appdata/airsonic-advanced/playlists:/data/playlists
Expand Down
Empty file modified compose/authelia.yml
100755 → 100644
Empty file.
1 change: 0 additions & 1 deletion compose/baikal.yml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ services:
profiles: ["apps", "all"]
networks:
- default
# - t3_proxy
ports:
- "$BAIKAL_PORT:80"
volumes:
Expand Down
1 change: 0 additions & 1 deletion compose/bazarr.yml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ services:
profiles: ["media", "starr", "all"]
networks:
- default
# - t3_proxy
ports:
- "$BAZARR_PORT:6767"
volumes:
Expand Down
1 change: 0 additions & 1 deletion compose/cadvisor.yml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ services:
profiles: ["apps", "all"]
networks:
- default
# - t3_proxy
ports:
- "$CADVISOR_PORT:8080"
# privileged: true # Only needed for CentOS, Fedora, Red Hat, etc.
Expand Down
1 change: 0 additions & 1 deletion compose/change-detection.yml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ services:
profiles: ["apps", "all"]
networks:
- default
# - t3_proxy
ports:
- "$CHANGEDETECTION_PORT:5000"
volumes:
Expand Down
1 change: 0 additions & 1 deletion compose/chromium.yml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ services:
shm_size: "1gb"
networks:
- default
# - t3_proxy
ports:
- "$CHROMIUM_PORT:3000" # HTTP
# - 3001:3001 # HTTPS
Expand Down
25 changes: 25 additions & 0 deletions compose/cloud-commander.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
services:
# Cloud Commander - web file manager
cloud-commander:
image: coderaiser/cloudcmd
container_name: cloud-commander
restart: unless-stopped
security_opt:
- no-new-privileges:true
profiles: ["apps", "all"]
networks:
- default
ports:
- "$CLOUDCOMMANDER_PORT:8000"
volumes:
- $DOCKERDIR/appdata/cloud-commander:/root
- $USERDIR:/data/$PRIMARY_USERNAME
# - $MEDIADIR1:/data/media1
# - $MEDIADIR2:/data/media2
# - $MEDIADIR3:/data/media3
environment:
PUID: $PUID
PGID: $PGID
TZ: $TZ
# DOCKER-LABELS-PLACEHOLDER

23 changes: 23 additions & 0 deletions compose/cloudflared.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
services:
# Cloudflared - Cloudflare Tunnel
cloudflared:
image: cloudflare/cloudflared:latest
container_name: cloudflared
security_opt:
- no-new-privileges:true
restart: unless-stopped
profiles: ["core", "all"]
network_mode: host
command: tunnel run
healthcheck:
test: ["CMD", "cloudflared", "--version"]
interval: 30s
timeout: 10s
retries: 3
start_period: 10s
volumes:
- /etc/localtime:/etc/localtime:ro
- $DOCKERDIR/appdata/cloudflared/hosts:/etc/hosts
environment:
- TUNNEL_TOKEN=$CLOUDFLARE_TUNNEL_TOKEN
# DOCKER-LABELS-PLACEHOLDER
21 changes: 21 additions & 0 deletions compose/crowdsec.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
services:
# CrowdSec - Open-source & Collaborative IPS
crowdsec:
image: crowdsecurity/crowdsec
container_name: crowdsec
security_opt:
- no-new-privileges:true
restart: unless-stopped
profiles: ["core", "all"]
ports:
- "$CROWDSEC_PORT:8080" # Local API port
- "6060:6060" # Exposing metrics via Zerotier IP
environment:
COLLECTIONS: "crowdsecurity/traefik crowdsecurity/http-cve crowdsecurity/whitelist-good-actors crowdsecurity/iptables crowdsecurity/linux fulljackz/proxmox crowdsecurity/sshd"
GID: $PGID
CUSTOM_HOSTNAME: $HOSTNAME
volumes:
- $DOCKERDIR/logs/$HOSTNAME:/logs/$HOSTNAME:ro
- /var/log:/var/log:ro
- $DOCKERDIR/appdata/crowdsec/data:/var/lib/crowdsec/data
- $DOCKERDIR/appdata/crowdsec/config:/etc/crowdsec
Empty file modified compose/custom.yml
100755 → 100644
Empty file.
1 change: 0 additions & 1 deletion compose/cyberchef.yml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ services:
profiles: ["apps", "all"]
networks:
- default
# - t3_proxy
ports:
- "$CYBERCHEF_PORT:8000"
# DOCKER-LABELS-PLACEHOLDER
1 change: 0 additions & 1 deletion compose/dashy.yml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ services:
profiles: ["apps", "all"]
networks:
- default
# - t3_proxy
ports:
- $DASHY_PORT:8080
healthcheck:
Expand Down
1 change: 0 additions & 1 deletion compose/ddns-updater.yml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ services:
profiles: ["core", "all"]
networks:
- default
# - t3_proxy
ports:
- "$DDNSUPDATER_PORT:8000"
volumes:
Expand Down
1 change: 0 additions & 1 deletion compose/deployarr-dashboard.yml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ services:
profiles: ["apps", "all"]
networks:
- default
# - t3_proxy
- socket_proxy
ports:
- "$DEPLOYARRDASHBOARD_PORT:3000"
Expand Down
Empty file modified compose/deunhealth.yml
100755 → 100644
Empty file.
21 changes: 21 additions & 0 deletions compose/digikam.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
services:
# Digikam - Photo Management
digikam:
image: ghcr.io/linuxserver/digikam
container_name: digikam
security_opt:
- no-new-privileges:true
restart: "unless-stopped"
profiles: ["apps", "all"]
networks:
- default
ports:
- "$DIGIKAM_PORT:3000" # HTTP
volumes:
- $DOCKERDIR/appdata/digikam:/config
- $PHOTOSDIR:/data/photos
environment:
TZ: $TZ
PUID: $PUID
PGID: $PGID
# DOCKER-LABELS-PLACEHOLDER
Empty file modified compose/docker-gc.yml
100755 → 100644
Empty file.
31 changes: 31 additions & 0 deletions compose/dockwatch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
services:
# Dockwatch - Docker Management and Notification
dockwatch:
image: ghcr.io/notifiarr/dockwatch:main
container_name: dockwatch
security_opt:
- no-new-privileges:true
restart: unless-stopped
profiles: ["apps", "all"]
ports:
- "$DOCKWATCH_PORT:80"
networks:
- socket_proxy
environment:
- DOCKER_HOST=tcp://socket-proxy:2375 # Uncomment and adjust accordingly if you use a socket proxy
- PUID=$PUID
- PGID=$PGID
- TZ=$TZ
- ALLOW_START=1
- ALLOW_STOP=1
- ALLOW_RESTARTS=1
- CONTAINERS=1
- IMAGES=1
- PORTS=1
- NETWORKS=1
- POST=1
- VOLUMES=1
volumes:
- $DOCKERDIR/appdata/dockwatch/config:/config
#- /var/run/docker.sock:/var/run/docker.sock # Comment this line if you use a socket proxy
# DOCKER-LABELS-PLACEHOLDER
26 changes: 26 additions & 0 deletions compose/double-commander.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
services:
# Double Commander - File Manager
double-commander:
image: lscr.io/linuxserver/doublecommander:latest
container_name: double-commander
security_opt:
- no-new-privileges:true
restart: "unless-stopped"
profiles: ["apps", "all"]
networks:
- default
ports:
- "$DOUBLECOMMANDER_PORT:3000" # HTTP
# - 3001:3001 # HTTPS
# DEVICES-GPU-PLACEHOLDER-DO-NOT-DELETE
volumes:
- $DOCKERDIR/appdata/double-commander:/config
- $USERDIR:/data/$PRIMARY_USERNAME
# - $MEDIADIR1:/data/media1
# - $MEDIADIR2:/data/media2
# - $MEDIADIR3:/data/media3
environment:
TZ: $TZ
PUID: $PUID
PGID: $PGID
# DOCKER-LABELS-PLACEHOLDER
1 change: 0 additions & 1 deletion compose/dozzle.yml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ services:
profiles: ["apps", "all"]
networks:
- default
# - t3_proxy
- socket_proxy
ports:
- "$DOZZLE_PORT:8080"
Expand Down
21 changes: 21 additions & 0 deletions compose/dweebui.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
services:
# DweebUI - WebUI for Docker Management
dweebui:
image: lllllllillllllillll/dweebui
container_name: dweebui
security_opt:
- no-new-privileges:true
restart: unless-stopped
profiles: ["apps", "all"]
networks:
- default
ports:
- "$DWEEBUI_PORT:8000"
volumes:
- $DOCKERDIR/appdata/dweebui:/app/config
# Docker socket
- /var/run/docker.sock:/var/run/docker.sock
environment:
PORT: 8000 # Leave it as-is
SECRET: $DWEEBUI_SECRET
# DOCKER-LABELS-PLACEHOLDER
Loading

0 comments on commit b1d3209

Please sign in to comment.