From 338bc764bdc00ff1cf518c5d52e23a141a1aecee Mon Sep 17 00:00:00 2001 From: LiDong Date: Wed, 14 Apr 2021 15:17:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E5=8C=BA?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4c38c9b..e3ca971 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,15 @@ FROM node:lts-alpine WORKDIR /app -# 设置时区 -RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -RUN echo 'Asia/Shanghai' >/etc/timezone +# 安装tzdata,默认的alpine基础镜像不包含时区组件,安装后可通过TZ环境变量配置时区 +RUN apk add --no-cache tzdata + +# 设置时区为中国东八区,这里的配置可以被docker-compose.yml或docker run时指定的时区覆盖 +ENV TZ="Asia/Shanghai" # 如果各公司有自己的私有源,可以替换registry地址,如使用官方源注释下一行 RUN npm set registry https://registry.npm.taobao.org + # 安装开发期依赖 COPY package.json ./package.json RUN npm install From 1c0026e629c187d6bf51e519e553020efefc3c46 Mon Sep 17 00:00:00 2001 From: LiDong Date: Wed, 14 Apr 2021 15:20:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=96=E6=B6=88git=E5=AF=B9typings?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=9A=84=E8=BF=BD=E8=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typings/app/index.d.ts | 7 ------- typings/config/index.d.ts | 36 ------------------------------------ typings/config/plugin.d.ts | 35 ----------------------------------- 3 files changed, 78 deletions(-) delete mode 100644 typings/app/index.d.ts delete mode 100644 typings/config/index.d.ts delete mode 100644 typings/config/plugin.d.ts diff --git a/typings/app/index.d.ts b/typings/app/index.d.ts deleted file mode 100644 index 69543bc..0000000 --- a/typings/app/index.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -// This file is created by egg-ts-helper@1.25.8 -// Do not modify this file!!!!!!!!! - -import 'egg'; -import '@midwayjs/web'; -export * from 'egg'; -export as namespace Egg; diff --git a/typings/config/index.d.ts b/typings/config/index.d.ts deleted file mode 100644 index fdc863b..0000000 --- a/typings/config/index.d.ts +++ /dev/null @@ -1,36 +0,0 @@ -// This file is created by egg-ts-helper@1.25.8 -// Do not modify this file!!!!!!!!! - -import '@midwayjs/web'; -import 'egg'; -import 'egg-onerror'; -import 'egg-session'; -import 'egg-i18n'; -import 'egg-multipart'; -import 'egg-security'; -import 'egg-logrotator'; -import 'egg-schedule'; -import 'egg-static'; -import 'egg-jsonp'; -import 'egg-view'; -import 'midway-schedule'; -import 'egg-view-nunjucks'; -import { EggPluginItem } from 'egg'; -declare module 'egg' { - interface EggPlugin { - onerror?: EggPluginItem; - session?: EggPluginItem; - i18n?: EggPluginItem; - watcher?: EggPluginItem; - multipart?: EggPluginItem; - security?: EggPluginItem; - development?: EggPluginItem; - logrotator?: EggPluginItem; - schedule?: EggPluginItem; - static?: EggPluginItem; - jsonp?: EggPluginItem; - view?: EggPluginItem; - schedulePlus?: EggPluginItem; - nunjucks?: EggPluginItem; - } -} \ No newline at end of file diff --git a/typings/config/plugin.d.ts b/typings/config/plugin.d.ts deleted file mode 100644 index 7722ddf..0000000 --- a/typings/config/plugin.d.ts +++ /dev/null @@ -1,35 +0,0 @@ -// This file is created by egg-ts-helper@1.25.8 -// Do not modify this file!!!!!!!!! - -import 'egg'; -import 'egg-onerror'; -import 'egg-session'; -import 'egg-i18n'; -import 'egg-multipart'; -import 'egg-security'; -import 'egg-logrotator'; -import 'egg-schedule'; -import 'egg-static'; -import 'egg-jsonp'; -import 'egg-view'; -import 'midway-schedule'; -import 'egg-view-nunjucks'; -import { EggPluginItem } from 'egg'; -declare module 'egg' { - interface EggPlugin { - onerror?: EggPluginItem; - session?: EggPluginItem; - i18n?: EggPluginItem; - watcher?: EggPluginItem; - multipart?: EggPluginItem; - security?: EggPluginItem; - development?: EggPluginItem; - logrotator?: EggPluginItem; - schedule?: EggPluginItem; - static?: EggPluginItem; - jsonp?: EggPluginItem; - view?: EggPluginItem; - schedulePlus?: EggPluginItem; - nunjucks?: EggPluginItem; - } -} \ No newline at end of file