Merged PR 282: エラーの挙動について確認する

## 概要
[Task2302: エラーの挙動について確認する](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/2302)

- ローカル環境でのみ静的ファイルをホストするよう修正
- 不要なビルドが行われている箇所を修正

## レビューポイント
- develop/staging環境での動作に影響がなさそうか
- 該当ファイルを修正しただけで問題なくCI/CDも修正される認識だが合っているか

## 動作確認状況
- ローカルで確認
This commit is contained in:
湯本 開 2023-07-28 03:56:36 +00:00
parent 386cee3bca
commit 9db2c1892e
3 changed files with 11 additions and 39 deletions

View File

@ -1,14 +1,9 @@
FROM node:18.13.0-buster AS build-container FROM node:18.13.0-buster AS build-container
WORKDIR /app WORKDIR /app
RUN mkdir dictation_client \ RUN mkdir dictation_server
&& mkdir dictation_server
COPY dictation_client/ dictation_client/
COPY dictation_server/ dictation_server/ COPY dictation_server/ dictation_server/
RUN npm install --force -g n && n 18.13.0 \ RUN npm install --force -g n && n 18.13.0 \
&& cd dictation_client \ && cd dictation_server \
&& npm ci \
&& npm run build \
&& cd ../dictation_server \
&& npm ci \ && npm ci \
&& npm run build \ && npm run build \
&& cd .. && cd ..
@ -22,7 +17,6 @@ WORKDIR /app
RUN mkdir build \ RUN mkdir build \
&& mkdir dist \ && mkdir dist \
&& mkdir node_modules && 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/dist/ dist/
COPY --from=build-container app/dictation_server/.env ./ COPY --from=build-container app/dictation_server/.env ./
COPY --from=build-container app/dictation_server/node_modules/ node_modules/ COPY --from=build-container app/dictation_server/node_modules/ node_modules/

View File

@ -1,29 +0,0 @@
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" ]

View File

@ -43,8 +43,15 @@ import { TemplateFilesRepositoryModule } from './repositories/template_files/tem
@Module({ @Module({
imports: [ imports: [
ServeStaticModule.forRoot({ ServeStaticModule.forRootAsync({
rootPath: join(__dirname, '..', 'build'), useFactory: () =>
process.env.STAGE === 'local'
? [
{
rootPath: join(__dirname, '..', 'build'),
},
]
: [],
}), }),
ConfigModule.forRoot({ ConfigModule.forRoot({
envFilePath: ['.env.local', '.env'], envFilePath: ['.env.local', '.env'],