Skip to content

Commit e498d6a

Browse files
committed
chore: add APP_NAME in dockerfile
1 parent 87caba1 commit e498d6a

File tree

9 files changed

+19
-244
lines changed

9 files changed

+19
-244
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@
2121
!**/**/.env.example
2222

2323
# turbo
24-
**/.turbo
24+
**/.turbo
25+
out

apps/cron/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ ENV AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
1919
ARG AWS_SECRET_ACCESS_KEY
2020
ENV AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
2121

22-
ENV APP_DIR="apps/cron"
22+
ENV APP_NAME="cron"
23+
ENV APP_DIR="apps/${APP_NAME}"
2324

2425
WORKDIR /app
2526

2627
FROM base AS pruner
2728
COPY . .
28-
RUN turbo prune cron --docker
29+
RUN turbo prune ${APP_NAME} --docker
2930

3031
FROM base As builder
3132
COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
@@ -36,7 +37,7 @@ COPY --from=pruner /app/out/full/ ./
3637
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
3738

3839
RUN pnpm --filter @packages/database prisma:generate
39-
RUN pnpm --filter cron ssm pull -e ${DOCKER_ENV}
40+
RUN pnpm --filter ${APP_NAME} ssm pull -e ${DOCKER_ENV}
4041
RUN turbo build:prod
4142

4243
FROM base As runner

apps/server/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ ENV AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
1919
ARG AWS_SECRET_ACCESS_KEY
2020
ENV AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
2121

22-
ENV APP_DIR="apps/server"
22+
ENV APP_NAME="server"
23+
ENV APP_DIR="apps/${APP_NAME}"
2324

2425
WORKDIR /app
2526

2627
FROM base AS pruner
2728
COPY . .
28-
RUN turbo prune server --docker
29+
RUN turbo prune ${APP_NAME} --docker
2930

3031
FROM base As builder
3132
COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
@@ -36,7 +37,7 @@ COPY --from=pruner /app/out/full/ ./
3637
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
3738

3839
RUN pnpm --filter @packages/database prisma:generate
39-
RUN pnpm --filter server ssm pull -e ${DOCKER_ENV}
40+
RUN pnpm --filter ${APP_NAME} ssm pull -e ${DOCKER_ENV}
4041
RUN turbo build:prod
4142

4243
FROM base As runner

apps/web/.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ README.md
77
.out
88
.prettierrc
99
.env
10+
.npmrc

apps/web/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ RUN turbo prune web --docker
2828
FROM base As builder
2929
COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
3030
COPY --from=pruner /app/out/pnpm-workspace.yaml ./pnpm-workspace.yaml
31-
COPY --from=pruner /app/out/json/ ./
3231
COPY --from=pruner /app/out/full/ ./
3332

3433
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
3534

3635
RUN pnpm --filter web ssm pull -e ${DOCKER_ENV}
37-
RUN pnpm -r env:copy -e ${DOCKER_ENV}
38-
RUN turbo build:prod
36+
RUN pnpm --filter web env:copy -e ${DOCKER_ENV}
37+
RUN turbo build
3938

4039
FROM base AS runner
4140
RUN addgroup --system --gid 1001 nodejs

apps/web/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
"create-component": "tsx ./scripts/createComponent.ts",
2424
"create-svg-component": "tsx ./scripts/createSvgComponent.ts",
2525
"codegen": "pnpm env:copy -e development && graphql-codegen --config codegen.ts -r dotenv/config",
26-
"ssm": "tsx ./scripts/ssm/index.ts"
26+
"ssm": "tsx ./scripts/ssm.mts"
2727
},
2828
"dependencies": {
29-
"@packages/common-scripts": "workspace:*",
3029
"@aws-sdk/client-ssm": "^3.431.0",
30+
"@packages/common-scripts": "workspace:*",
3131
"@sentry/browser": "^7.75.0",
3232
"@tanstack/react-query": "^5.18.0",
3333
"axios": "^1.4.0",

apps/web/scripts/ssm.mts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import { SSMScript } from '@packages/common-scripts'
2+
3+
const script = new SSMScript({ packageName: 'web' })
4+
script.excute()

apps/web/scripts/ssm/README.md

Lines changed: 0 additions & 43 deletions
This file was deleted.

apps/web/scripts/ssm/index.ts

Lines changed: 0 additions & 189 deletions
This file was deleted.

0 commit comments

Comments
 (0)