Revert "Merged PR 282: エラーの挙動について確認する"
This reverts commit 9db2c1892e7c3512f07b7cbf30b0fd736e60d227.
This commit is contained in:
parent
9db2c1892e
commit
6ad3a81e08
@ -1,9 +1,14 @@
|
|||||||
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_server
|
RUN mkdir dictation_client \
|
||||||
|
&& 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_server \
|
&& cd dictation_client \
|
||||||
|
&& npm ci \
|
||||||
|
&& npm run build \
|
||||||
|
&& cd ../dictation_server \
|
||||||
&& npm ci \
|
&& npm ci \
|
||||||
&& npm run build \
|
&& npm run build \
|
||||||
&& cd ..
|
&& cd ..
|
||||||
@ -17,6 +22,7 @@ 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/
|
||||||
|
|||||||
29
DockerfileServerLicense.dockerfile
Normal file
29
DockerfileServerLicense.dockerfile
Normal file
@ -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" ]
|
||||||
@ -43,15 +43,8 @@ import { TemplateFilesRepositoryModule } from './repositories/template_files/tem
|
|||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
ServeStaticModule.forRootAsync({
|
ServeStaticModule.forRoot({
|
||||||
useFactory: () =>
|
rootPath: join(__dirname, '..', 'build'),
|
||||||
process.env.STAGE === 'local'
|
|
||||||
? [
|
|
||||||
{
|
|
||||||
rootPath: join(__dirname, '..', 'build'),
|
|
||||||
},
|
|
||||||
]
|
|
||||||
: [],
|
|
||||||
}),
|
}),
|
||||||
ConfigModule.forRoot({
|
ConfigModule.forRoot({
|
||||||
envFilePath: ['.env.local', '.env'],
|
envFilePath: ['.env.local', '.env'],
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user