Skip to content

Commit

Permalink
Merge branch 'rainbowcat' of github.com:clansty/Q2TG into rainbowcat
Browse files Browse the repository at this point in the history
  • Loading branch information
Nofated095 committed Jan 12, 2024
2 parents 61570f7 + b278a68 commit 77e08cc
Show file tree
Hide file tree
Showing 14 changed files with 288 additions and 106 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
push: true
push: ${{ github.actor != 'dependabot[bot]' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
platforms: linux/amd64
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
COPY package.json pnpm-lock.yaml /app/

FROM build-env AS prod-deps
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prod --frozen-lockfile
RUN --mount=type=cache,id=pnpm,target=/pnpm/store,sharing=locked pnpm install --prod --frozen-lockfile

FROM build-env AS build
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
RUN --mount=type=cache,id=pnpm,target=/pnpm/store,sharing=locked pnpm install --frozen-lockfile
COPY src tsconfig.json /app/
COPY prisma /app/
RUN pnpm exec prisma generate
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ services:
- sign
volumes:
- q2tg:/app/data
- /var/run/docker.sock:/var/run/docker.sock
environment:
- TG_API_ID=
- TG_API_HASH=
Expand Down
17 changes: 9 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,28 @@
],
"devDependencies": {
"@types/cli-progress": "^3.11.5",
"@types/date-and-time": "^0.13.0",
"@types/date-and-time": "^3.0.3",
"@types/dockerode": "^3.3.23",
"@types/fluent-ffmpeg": "^2.1.24",
"@types/lodash": "^4.14.201",
"@types/node": "^20.10.7",
"@types/node": "^20.10.8",
"@types/prompts": "^2.4.9",
"@types/sharp": "^0.32.0",
"ts-node": "^10.9.2",
"typescript": "^5.3.3"
},
"dependencies": {
"@prisma/client": "5.8.0",
"axios": "^0.27.2",
"axios": "^1.6.5",
"baidu-aip-sdk": "^4.16.15",
"big-integer": "^1.6.51",
"big-integer": "^1.6.52",
"cli-progress": "^3.11.2",
"date-and-time": "^2.4.1",
"date-and-time": "^3.1.0",
"dockerode": "^4.0.2",
"dotenv": "^16.0.1",
"eviltransform": "^0.2.2",
"file-type": "^19.0.0",
"fluent-ffmpeg": "^2.1.2",
"icqq": "^0.6.7",
"icqq": "^0.6.8",
"image-size": "^1.1.1",
"lodash": "^4.17.21",
"log4js": "^6.6.1",
Expand All @@ -46,7 +47,7 @@
"silk-sdk": "^0.2.2",
"telegram": "^2.19.10",
"tmp-promise": "^3.0.3",
"undici": "^5.20.0",
"undici": "^6.3.0",
"zincsearch-node": "^2.1.0"
},
"engines": {
Expand Down
Loading

0 comments on commit 77e08cc

Please sign in to comment.