From 53bede692d4f0e940dededa63015fe1908129914 Mon Sep 17 00:00:00 2001 From: sct Date: Sat, 19 Dec 2020 11:32:17 +0900 Subject: [PATCH] feat: add missing tzdata package to image re #394 --- Dockerfile | 2 ++ overseerr-api.yml | 4 ++++ server/interfaces/api/settingsInterfaces.ts | 1 + server/routes/settings.ts | 4 +++- src/components/Settings/SettingsAbout/index.tsx | 6 ++++++ 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1afedf3d9..48bd94d42 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,8 @@ FROM node:12.18-alpine ARG COMMIT_TAG ENV COMMIT_TAG=${COMMIT_TAG} +RUN apk add tzdata + COPY . /app WORKDIR /app diff --git a/overseerr-api.yml b/overseerr-api.yml index d84ac3fac..209017974 100644 --- a/overseerr-api.yml +++ b/overseerr-api.yml @@ -1542,6 +1542,10 @@ paths: totalMediaItems: type: number example: 100 + tz: + type: string + nullable: true + example: Asia/Tokyo /auth/me: get: summary: Returns the currently logged in user diff --git a/server/interfaces/api/settingsInterfaces.ts b/server/interfaces/api/settingsInterfaces.ts index bc6dcf024..2938e6967 100644 --- a/server/interfaces/api/settingsInterfaces.ts +++ b/server/interfaces/api/settingsInterfaces.ts @@ -2,4 +2,5 @@ export interface SettingsAboutResponse { version: string; totalRequests: number; totalMediaItems: number; + tz?: string; } diff --git a/server/routes/settings.ts b/server/routes/settings.ts index f90ae9b62..8f72e588a 100644 --- a/server/routes/settings.ts +++ b/server/routes/settings.ts @@ -20,6 +20,7 @@ import { merge } from 'lodash'; import Media from '../entity/Media'; import { MediaRequest } from '../entity/MediaRequest'; import { getAppVersion } from '../utils/appVersion'; +import { SettingsAboutResponse } from '../interfaces/api/settingsInterfaces'; const settingsRoutes = Router(); @@ -473,7 +474,8 @@ settingsRoutes.get('/about', async (req, res) => { version: getAppVersion(), totalMediaItems, totalRequests, - }); + tz: process.env.TZ, + } as SettingsAboutResponse); }); export default settingsRoutes; diff --git a/src/components/Settings/SettingsAbout/index.tsx b/src/components/Settings/SettingsAbout/index.tsx index 7925e1935..958951ffe 100644 --- a/src/components/Settings/SettingsAbout/index.tsx +++ b/src/components/Settings/SettingsAbout/index.tsx @@ -14,6 +14,7 @@ const messages = defineMessages({ gettingsupport: 'Getting Support', githubdiscussions: 'GitHub Discussions', clickheretojoindiscord: 'Click here to join our Discord server.', + timezone: 'Timezone', }); const SettingsAbout: React.FC = () => { @@ -47,6 +48,11 @@ const SettingsAbout: React.FC = () => { + {data.tz && ( + + {data.tz} + + )}