diff --git a/Dockerfile b/Dockerfile index a58108b3..bc07a27b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,10 @@ FROM node:10 WORKDIR /usr/src/app + COPY package.json . COPY pm2.json . +COPY .env.production . # install backend dependencies RUN yarn @@ -22,7 +24,7 @@ WORKDIR /usr/src/app/client RUN yarn # build frontend -RUN yarn build +RUN export $(cat /usr/src/app/.env.production); yarn build WORKDIR /usr/src/app diff --git a/app/emails/event/html.pug b/app/emails/event/html.pug index dfaa099f..2fefccc6 100644 --- a/app/emails/event/html.pug +++ b/app/emails/event/html.pug @@ -7,7 +7,7 @@ if event.image_path p #{event.description} each tag in event.tags - span ##{tag.tag} + span ##{tag.tag} br #{config.baseurl}/event/#{event.id} hr diff --git a/client/vue.config.js b/client/vue.config.js index 05365256..a06dc7fc 100644 --- a/client/vue.config.js +++ b/client/vue.config.js @@ -8,7 +8,7 @@ module.exports = { publicPath: process.env.BASE_URL, configureWebpack: { plugins: [ - new webpack.NormalModuleReplacementPlugin(/element-ui[\/\\]lib[\/\\]locale[\/\\]lang[\/\\]zh-CN/, 'element-ui/lib/locale/lang/en') + new webpack.NormalModuleReplacementPlugin(/element-ui[/\\]lib[/\\]locale[/\\]lang[/\\]zh-CN/, 'element-ui/lib/locale/lang/en') ] }, devServer: { @@ -16,6 +16,6 @@ module.exports = { }, transpileDependencies: [ /\bvue-awesome\b/, - 'vuex-persist', + 'vuex-persist' ] }