diff --git a/VERSION b/VERSION index 6e8bf73..17e51c3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.0 +0.1.1 diff --git a/api/build.gradle b/api/build.gradle index 5637bb1..8151fe3 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'telegram.files' -version = '0.1.0' +version = '0.1.1' repositories { mavenCentral() diff --git a/api/src/main/java/telegram/files/Start.java b/api/src/main/java/telegram/files/Start.java index cae1388..90e7640 100644 --- a/api/src/main/java/telegram/files/Start.java +++ b/api/src/main/java/telegram/files/Start.java @@ -7,7 +7,7 @@ import io.vertx.core.Vertx; public class Start { private static final Log log = LogFactory.get(); - public static final String VERSION = "0.1.0"; + public static final String VERSION = "0.1.1"; public static void main(String[] args) { Vertx vertx = Vertx.vertx(); diff --git a/docker-compose.yaml b/docker-compose.yaml index 32b6ba7..580ff1a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,10 +1,14 @@ services: telegram-files: container_name: telegram-files - image: telegram-files:latest + image: ghcr.io/jarvis2f/telegram-files:latest restart: always healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:80/"] + test: [ "CMD", "wget", "--spider", "--quiet", "--timeout=3", "--tries=1", "http://localhost:8080/health" ] + interval: 30s + retries: 3 + timeout: 10s + start_period: 5s environment: APP_ENV: ${APP_ENV:-prod} APP_ROOT: ${APP_ROOT:-/app/data} @@ -13,4 +17,4 @@ services: ports: - "6543:80" volumes: - - ./telegram-files:/app/data + - ./data:/app/data diff --git a/entrypoint.sh b/entrypoint.sh index af3d7e3..f69183c 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -4,7 +4,7 @@ lib_path="/app/tdlib" if [ ! -d "$lib_path" ]; then echo "Downloading TDLib..." mkdir -p $lib_path - wget -q -O libs.zip https://github.com/p-vorobyev/spring-boot-starter-telegram/releases/download/1.15.0/libs.zip + wget --no-check-certificate -q -O libs.zip https://github.com/p-vorobyev/spring-boot-starter-telegram/releases/download/1.15.0/libs.zip unzip -q libs.zip -d $lib_path rm libs.zip fi diff --git a/web/package.json b/web/package.json index 2181443..9920a14 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "telegram-files-web", - "version": "0.1.0", + "version": "0.1.1", "private": true, "type": "module", "scripts": { diff --git a/web/src/app/account/[accountId]/layout.tsx b/web/src/app/account/[accountId]/layout.tsx new file mode 100644 index 0000000..2c26221 --- /dev/null +++ b/web/src/app/account/[accountId]/layout.tsx @@ -0,0 +1,10 @@ +import React from "react"; +import { TelegramChatProvider } from "@/hooks/use-telegram-chat"; + +export default function AccountLayout({ + children, +}: { + children: React.ReactNode; +}) { + return {children}; +}