From 0138b16bd9eb5f80de10f2c4f07379439cbd202f Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Wed, 19 Oct 2022 21:10:46 +0200 Subject: [PATCH] feat: add supported_architecture to invidious & libreddit --- apps/invidious/config.json | 3 ++- ...mpose.arm.yml => docker-compose.arm64.yml} | 0 apps/libreddit/docker-compose.arm.yml | 2 +- apps/libreddit/docker-compose.arm64.yml | 19 +++++++++++++++++++ apps/libreddit/docker-compose.yml | 2 +- apps/librephotos/config.json | 5 ++--- apps/schema.json | 8 ++++++++ 7 files changed, 33 insertions(+), 6 deletions(-) rename apps/invidious/{docker-compose.arm.yml => docker-compose.arm64.yml} (100%) create mode 100644 apps/libreddit/docker-compose.arm64.yml diff --git a/apps/invidious/config.json b/apps/invidious/config.json index a1db11fc..e4abb6ff 100644 --- a/apps/invidious/config.json +++ b/apps/invidious/config.json @@ -6,7 +6,8 @@ "port": 8095, "id": "invidious", "version": "latest", - "tipi_version": 2, + "tipi_version": 3, + "supported_architectures": ["arm64", "amd64"], "categories": ["media", "social"], "description": "Invidious is an open source alternative front-end to YouTube.", "short_desc": "An alternative front-end to YouTube", diff --git a/apps/invidious/docker-compose.arm.yml b/apps/invidious/docker-compose.arm64.yml similarity index 100% rename from apps/invidious/docker-compose.arm.yml rename to apps/invidious/docker-compose.arm64.yml diff --git a/apps/libreddit/docker-compose.arm.yml b/apps/libreddit/docker-compose.arm.yml index b9001bf0..7b1bffef 100644 --- a/apps/libreddit/docker-compose.arm.yml +++ b/apps/libreddit/docker-compose.arm.yml @@ -2,7 +2,7 @@ version: "3.7" services: libreddit: container_name: libreddit - image: spikecodes/libreddit:arm + image: spikecodes/libreddit:armv7 dns: - ${DNS_IP} ports: diff --git a/apps/libreddit/docker-compose.arm64.yml b/apps/libreddit/docker-compose.arm64.yml new file mode 100644 index 00000000..b9001bf0 --- /dev/null +++ b/apps/libreddit/docker-compose.arm64.yml @@ -0,0 +1,19 @@ +version: "3.7" +services: + libreddit: + container_name: libreddit + image: spikecodes/libreddit:arm + dns: + - ${DNS_IP} + ports: + - ${APP_PORT}:8080 + restart: unless-stopped + networks: + - tipi_main_network + labels: + traefik.enable: ${APP_EXPOSED} + traefik.http.routers.libreddit.rule: Host(`${APP_DOMAIN}`) + traefik.http.routers.libreddit.entrypoints: websecure + traefik.http.routers.libreddit.service: libreddit + traefik.http.routers.libreddit.tls.certresolver: myresolver + traefik.http.services.libreddit.loadbalancer.server.port: 8080 \ No newline at end of file diff --git a/apps/libreddit/docker-compose.yml b/apps/libreddit/docker-compose.yml index 9cb9e884..1651d615 100644 --- a/apps/libreddit/docker-compose.yml +++ b/apps/libreddit/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: libreddit: container_name: libreddit - image: spikecodes/libreddit + image: spikecodes/libreddit:latest dns: - ${DNS_IP} ports: diff --git a/apps/librephotos/config.json b/apps/librephotos/config.json index f26354da..829189a9 100644 --- a/apps/librephotos/config.json +++ b/apps/librephotos/config.json @@ -7,9 +7,8 @@ "id": "librephotos", "tipi_version": 2, "version": "2022w39", - "categories": [ - "photography" - ], + "supported_architectures": ["amd64", "arm64"], + "categories": ["photography"], "description": "", "short_desc": "", "author": "Niaz Faridani-Rad", diff --git a/apps/schema.json b/apps/schema.json index d3acf326..6cec4010 100644 --- a/apps/schema.json +++ b/apps/schema.json @@ -36,6 +36,14 @@ } } }, + "supported_architectures": { + "type": "array", + "items": [ + { + "type": "string" + } + ] + }, "id": { "type": "string", "pattern": "^[a-z0-9-_]+$"