From dae185ed9484dc39db16f3ccfe2ad0e804e1713c Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Wed, 7 Sep 2022 07:09:27 +0200 Subject: [PATCH] chore: align docker version to 3.7 --- apps/booksonic/config.json | 2 +- apps/booksonic/docker-compose.yml | 2 +- apps/bookstack/config.json | 2 +- apps/bookstack/docker-compose.yml | 2 +- apps/docker-compose.common.yml | 2 +- apps/portainer/config.json | 2 +- apps/portainer/docker-compose.yml | 2 +- apps/readarr/config.json | 2 +- apps/readarr/docker-compose.yml | 2 +- apps/vaultwarden/config.json | 3 ++- apps/vaultwarden/docker-compose.yml | 7 +++++++ apps/wg-easy/config.json | 2 +- apps/wg-easy/docker-compose.yml | 2 +- 13 files changed, 20 insertions(+), 12 deletions(-) diff --git a/apps/booksonic/config.json b/apps/booksonic/config.json index 3805b1b4..3278fdd6 100644 --- a/apps/booksonic/config.json +++ b/apps/booksonic/config.json @@ -3,7 +3,7 @@ "name": "Booksonic", "available": true, "port": 8040, - "tipi_version": 1, + "tipi_version": 2, "version": "latest", "id": "booksonic", "categories": ["books", "media"], diff --git a/apps/booksonic/docker-compose.yml b/apps/booksonic/docker-compose.yml index 6d45d681..ddc345f9 100644 --- a/apps/booksonic/docker-compose.yml +++ b/apps/booksonic/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.9" +version: "3.7" services: booksonic: image: lscr.io/linuxserver/booksonic-air:latest diff --git a/apps/bookstack/config.json b/apps/bookstack/config.json index 16e42811..81ba551a 100644 --- a/apps/bookstack/config.json +++ b/apps/bookstack/config.json @@ -4,7 +4,7 @@ "available": true, "port": 8119, "id": "bookstack", - "tipi_version": 1, + "tipi_version": 2, "version": "22.07.3", "description": "BookStack is a simple, self-hosted, easy-to-use platform for organising and storing information. Default login: admin@admin.com password: password", "short_desc": "BookStack is a self-hosted platform for organising and storing information.", diff --git a/apps/bookstack/docker-compose.yml b/apps/bookstack/docker-compose.yml index 6731286b..574c834a 100644 --- a/apps/bookstack/docker-compose.yml +++ b/apps/bookstack/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.9" +version: "3.7" services: bookstack: image: lscr.io/linuxserver/bookstack:22.07.3 diff --git a/apps/docker-compose.common.yml b/apps/docker-compose.common.yml index 5930e141..23cc7651 100644 --- a/apps/docker-compose.common.yml +++ b/apps/docker-compose.common.yml @@ -1,4 +1,4 @@ -version: "3.9" +version: "3.7" networks: tipi_main_network: diff --git a/apps/portainer/config.json b/apps/portainer/config.json index dbc0c686..b22d3a40 100644 --- a/apps/portainer/config.json +++ b/apps/portainer/config.json @@ -4,7 +4,7 @@ "port": 9443, "available": true, "id": "portainer", - "tipi_version": 1, + "tipi_version": 2, "version": "2.14.2", "categories": ["utilities"], "description": "", diff --git a/apps/portainer/docker-compose.yml b/apps/portainer/docker-compose.yml index 76feb5e1..76a4a2f7 100644 --- a/apps/portainer/docker-compose.yml +++ b/apps/portainer/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.9" +version: "3.7" services: portainer: diff --git a/apps/readarr/config.json b/apps/readarr/config.json index 64eb5c68..7d709465 100644 --- a/apps/readarr/config.json +++ b/apps/readarr/config.json @@ -4,7 +4,7 @@ "available": true, "port": 8112, "id": "readarr", - "tipi_version": 1, + "tipi_version": 2, "version": "develop", "categories": ["books", "media"], "description": "", diff --git a/apps/readarr/docker-compose.yml b/apps/readarr/docker-compose.yml index f687e65f..3e97ccd5 100644 --- a/apps/readarr/docker-compose.yml +++ b/apps/readarr/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.9" +version: "3.7" services: readarr: image: lscr.io/linuxserver/readarr:develop diff --git a/apps/vaultwarden/config.json b/apps/vaultwarden/config.json index 496dadc6..cae8a404 100644 --- a/apps/vaultwarden/config.json +++ b/apps/vaultwarden/config.json @@ -2,9 +2,10 @@ "$schema": "../schema.json", "name": "VaultWarden", "available": true, + "exposable": true, "port": 8107, "id": "vaultwarden", - "tipi_version": 1, + "tipi_version": 2, "version": "1.25.1", "categories": ["utilities"], "description": "Alternative implementation of the Bitwarden server API written in Rust and compatible with upstream Bitwarden clients, perfect for self-hosted deployment where running the official resource-heavy service might not be ideal.", diff --git a/apps/vaultwarden/docker-compose.yml b/apps/vaultwarden/docker-compose.yml index 9ec92962..7a355d6e 100644 --- a/apps/vaultwarden/docker-compose.yml +++ b/apps/vaultwarden/docker-compose.yml @@ -14,3 +14,10 @@ services: - ${APP_DATA_DIR}/data:/data networks: - tipi_main_network + labels: + traefik.enable: ${APP_EXPOSED} + traefik.http.routers.vaultwarden.rule: Host(`${APP_DOMAIN}`) + traefik.http.routers.vaultwarden.entrypoints: websecure + traefik.http.routers.vaultwarden.service: vaultwarden + traefik.http.routers.vaultwarden.tls.certresolver: myresolver + traefik.http.services.vaultwarden.loadbalancer.server.port: 80 diff --git a/apps/wg-easy/config.json b/apps/wg-easy/config.json index 4ebb4be3..1245a16b 100644 --- a/apps/wg-easy/config.json +++ b/apps/wg-easy/config.json @@ -7,7 +7,7 @@ "ports": [51820] }, "id": "wg-easy", - "tipi_version": 2, + "tipi_version": 3, "version": "7", "categories": ["network"], "description": "Access your homeserver from anywhere even on your mobile device. Wireguard-easy is a simple tool to configure and manage Wireguard VPN servers. It is written in Go and uses the official Wireguard client. You have to open and redirect port 51820 to your homeserver in order to connect.", diff --git a/apps/wg-easy/docker-compose.yml b/apps/wg-easy/docker-compose.yml index e81afd95..93af5a0a 100644 --- a/apps/wg-easy/docker-compose.yml +++ b/apps/wg-easy/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.8" +version: "3.7" services: wg-easy: container_name: wg-easy