feat: add missing tzdata package to image

re #394
pull/395/head
sct 4 years ago
parent fe46895289
commit 53bede692d

@ -15,6 +15,8 @@ FROM node:12.18-alpine
ARG COMMIT_TAG ARG COMMIT_TAG
ENV COMMIT_TAG=${COMMIT_TAG} ENV COMMIT_TAG=${COMMIT_TAG}
RUN apk add tzdata
COPY . /app COPY . /app
WORKDIR /app WORKDIR /app

@ -1542,6 +1542,10 @@ paths:
totalMediaItems: totalMediaItems:
type: number type: number
example: 100 example: 100
tz:
type: string
nullable: true
example: Asia/Tokyo
/auth/me: /auth/me:
get: get:
summary: Returns the currently logged in user summary: Returns the currently logged in user

@ -2,4 +2,5 @@ export interface SettingsAboutResponse {
version: string; version: string;
totalRequests: number; totalRequests: number;
totalMediaItems: number; totalMediaItems: number;
tz?: string;
} }

@ -20,6 +20,7 @@ import { merge } from 'lodash';
import Media from '../entity/Media'; import Media from '../entity/Media';
import { MediaRequest } from '../entity/MediaRequest'; import { MediaRequest } from '../entity/MediaRequest';
import { getAppVersion } from '../utils/appVersion'; import { getAppVersion } from '../utils/appVersion';
import { SettingsAboutResponse } from '../interfaces/api/settingsInterfaces';
const settingsRoutes = Router(); const settingsRoutes = Router();
@ -473,7 +474,8 @@ settingsRoutes.get('/about', async (req, res) => {
version: getAppVersion(), version: getAppVersion(),
totalMediaItems, totalMediaItems,
totalRequests, totalRequests,
}); tz: process.env.TZ,
} as SettingsAboutResponse);
}); });
export default settingsRoutes; export default settingsRoutes;

@ -14,6 +14,7 @@ const messages = defineMessages({
gettingsupport: 'Getting Support', gettingsupport: 'Getting Support',
githubdiscussions: 'GitHub Discussions', githubdiscussions: 'GitHub Discussions',
clickheretojoindiscord: 'Click here to join our Discord server.', clickheretojoindiscord: 'Click here to join our Discord server.',
timezone: 'Timezone',
}); });
const SettingsAbout: React.FC = () => { const SettingsAbout: React.FC = () => {
@ -47,6 +48,11 @@ const SettingsAbout: React.FC = () => {
<List.Item title={intl.formatMessage(messages.totalrequests)}> <List.Item title={intl.formatMessage(messages.totalrequests)}>
<FormattedNumber value={data.totalRequests} /> <FormattedNumber value={data.totalRequests} />
</List.Item> </List.Item>
{data.tz && (
<List.Item title={intl.formatMessage(messages.timezone)}>
{data.tz}
</List.Item>
)}
</List> </List>
</div> </div>
<div className="mb-8"> <div className="mb-8">

Loading…
Cancel
Save