diff --git a/DockerfileServerDictation.dockerfile b/DockerfileServerDictation.dockerfile index fa06e84..1cfdee4 100644 --- a/DockerfileServerDictation.dockerfile +++ b/DockerfileServerDictation.dockerfile @@ -1,9 +1,14 @@ FROM node:18.13.0-buster AS build-container WORKDIR /app -RUN mkdir dictation_server +RUN mkdir dictation_client \ + && mkdir dictation_server +COPY dictation_client/ dictation_client/ COPY dictation_server/ dictation_server/ RUN npm install --force -g n && n 18.13.0 \ - && cd dictation_server \ + && cd dictation_client \ + && npm ci \ + && npm run build \ + && cd ../dictation_server \ && npm ci \ && npm run build \ && cd .. @@ -17,6 +22,7 @@ WORKDIR /app RUN mkdir build \ && mkdir dist \ && mkdir node_modules +COPY --from=build-container app/dictation_client/build/ build/ COPY --from=build-container app/dictation_server/dist/ dist/ COPY --from=build-container app/dictation_server/.env ./ COPY --from=build-container app/dictation_server/node_modules/ node_modules/ diff --git a/DockerfileServerLicense.dockerfile b/DockerfileServerLicense.dockerfile new file mode 100644 index 0000000..121511b --- /dev/null +++ b/DockerfileServerLicense.dockerfile @@ -0,0 +1,29 @@ +FROM node:18.13.0-buster AS build-container +WORKDIR /app +RUN mkdir license_client \ + && mkdir license_server +COPY license_client/ license_client/ +COPY license_server/ license_server/ +RUN npm install --force -g n && n 18.13.0 \ + && cd license_client \ + && npm ci \ + && npm run build \ + && cd ../license_server \ + && npm ci \ + && npm run build \ + && cd .. + +FROM node:18.13.0-alpine +RUN apk --no-cache add tzdata \ + && cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime \ + && apk del tzdata \ + && rm -rf /var/cache/apk/* +WORKDIR /app +RUN mkdir build \ + && mkdir dist \ + && mkdir node_modules +COPY --from=build-container app/license_client/build/ build/ +COPY --from=build-container app/license_server/dist/ dist/ +COPY --from=build-container app/license_server/.env ./ +COPY --from=build-container app/license_server/node_modules/ node_modules/ +CMD ["node", "./dist/main.js" ] \ No newline at end of file diff --git a/dictation_server/src/app.module.ts b/dictation_server/src/app.module.ts index 172cb56..a7b3f86 100644 --- a/dictation_server/src/app.module.ts +++ b/dictation_server/src/app.module.ts @@ -43,15 +43,8 @@ import { TemplateFilesRepositoryModule } from './repositories/template_files/tem @Module({ imports: [ - ServeStaticModule.forRootAsync({ - useFactory: () => - process.env.STAGE === 'local' - ? [ - { - rootPath: join(__dirname, '..', 'build'), - }, - ] - : [], + ServeStaticModule.forRoot({ + rootPath: join(__dirname, '..', 'build'), }), ConfigModule.forRoot({ envFilePath: ['.env.local', '.env'],