Skip to content

Commit

Permalink
build: update docker build
Browse files Browse the repository at this point in the history
  • Loading branch information
yuler committed Oct 9, 2023
1 parent bbc3025 commit 711edc3
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ jobs:
docker pull ${{ steps.meta.outputs.tags }}
docker stop ${{ env.CONTAINER_NAME }} || echo "stop [${{ env.CONTAINER_NAME}}] error"
docker rm ${{ env.CONTAINER_NAME }} || echo "rm [${{ env.CONTAINER_NAME}}] error"
docker run -e DATABASE_URL="${{ secrets.DATABASE_URL }}" -d -p ${{ env.PORT }}:3000 --name ${{ env.CONTAINER_NAME }} -it ${{ steps.meta.outputs.tags }}
docker run -e DATABASE_URL="${{ secrets.DATABASE_URL }}" -d -p ${{ env.PORT }}:3000 --network=host --name ${{ env.CONTAINER_NAME }} -it ${{ steps.meta.outputs.tags }}
6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN pnpm install
# COPY --from=deps /app/node_modules /app/node_modules
ADD . .
RUN npx prisma generate
RUN npm run build
RUN pnpm run build

# Stage: finally
FROM base
Expand All @@ -25,8 +25,6 @@ ENV PORT="3000"
WORKDIR /app
COPY --from=build /app/.output /app/.output
COPY --from=build /app/prisma /app/prisma
COPY --from=build /app/package.json /app/package.json
COPY --from=build /app/pnpm-lock.yaml /app/pnpm-lock.yaml
COPY --from=build /app/.npmrc /app/.npmrc
COPY --from=build /app/start.sh /app/start.sh
RUN pnpm install prisma
ENTRYPOINT [ "./start.sh" ]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ docker run --name mysql -e MYSQL_ROOT_PASSWORD=root -p 3306:3306 -d mysql:8

```bash
docker build . -t apibeer
docker run -d --name apibeer --env-file .env -p 3000:3000 -it apibeer
docker run -d --name apibeer --env-file .env --network=host -p 3000:3000 -it apibeer
```

## Related
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"packageManager": "[email protected]",
"scripts": {
"dev": "prisma generate && nuxt dev",
"start": "node .output/server/index.mjs",
"build": "nuxt build",
"generate": "nuxt generate",
"preview": "nuxt preview",
Expand Down
2 changes: 1 addition & 1 deletion start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

set -ex
pnpm dlx prisma migrate deploy
pnpm start
node .output/server/index.mjs

0 comments on commit 711edc3

Please sign in to comment.