From aa6accca7a4f819f834968abf897c93ec04c8bce Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Fri, 12 Jan 2024 17:27:31 +0700 Subject: [PATCH] fix timezone issues --- .dockerignore | 4 +++- .drone.yml | 1 + docker/Dockerfile | 4 ++-- src/service/calendar/index.ts | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.dockerignore b/.dockerignore index 74c246b..c877f95 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,6 @@ .drone.yml node_modules .idea -**/node_modules \ No newline at end of file +dist +.vscode +*.test.* \ No newline at end of file diff --git a/.drone.yml b/.drone.yml index b0c7aee..71edc27 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,6 +14,7 @@ steps: - master settings: dockerfile: docker/Dockerfile + context: "." tag: - latest username: diff --git a/docker/Dockerfile b/docker/Dockerfile index b604351..1fdd0e0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,8 @@ -FROM node:lts-fermium +FROM node:18-bookworm as builder WORKDIR /app +RUN apt update && apt install tzdata -y COPY ./package.json . COPY ./yarn.lock . RUN yarn @@ -11,7 +12,6 @@ RUN yarn build WORKDIR /app/dist COPY ./docker/wait-for-it.sh . - EXPOSE 80 CMD ["node", "./index.js"] diff --git a/src/service/calendar/index.ts b/src/service/calendar/index.ts index a0e3617..1719eb6 100644 --- a/src/service/calendar/index.ts +++ b/src/service/calendar/index.ts @@ -8,7 +8,7 @@ export class CalendarService { constructor( key: KeyFile, - private timeZone: string, // idk, use it someday + private timeZone: string, private log: (...vals: any) => void ) { this.auth = new google.auth.JWT( @@ -61,9 +61,11 @@ export class CalendarService { description, start: { dateTime: start.toISOString(), + timeZone: this.timeZone, }, end: { dateTime: end.toISOString(), + timeZone: this.timeZone, }, iCalUID: eventId, },