diff --git a/app/backend/Dockerfile.prod b/app/backend/Dockerfile.prod index 02e4bb8..ad198f3 100644 --- a/app/backend/Dockerfile.prod +++ b/app/backend/Dockerfile.prod @@ -23,7 +23,7 @@ RUN pip install --upgrade pip setuptools wheel -i https://pypi.tuna.tsinghua.edu RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels -i https://pypi.tuna.tsinghua.edu.cn/simple pipenv RUN pip install --no-cache-dir --find-links=/usr/src/app/wheels pipenv COPY ./Pipfile . -RUN pipenv install --deploy +RUN pipenv lock --pre && pipenv install --deploy # add app COPY . /usr/src/app @@ -68,7 +68,7 @@ COPY --from=builder /usr/src/app/wheels /wheels COPY --from=builder /usr/src/app/Pipfile . RUN pip install --upgrade pip setuptools wheel -i https://pypi.tuna.tsinghua.edu.cn/simple RUN pip install --no-cache /wheels/* -RUN pipenv install --deploy --ignore-pipfile --dev +RUN pipenv lock --pre && pipenv install --deploy RUN pipenv run pip install "uvicorn[standard]==0.26.0" # add app diff --git a/app/frontend/package-lock.json b/app/frontend/package-lock.json index 0d36139..913bb1f 100644 --- a/app/frontend/package-lock.json +++ b/app/frontend/package-lock.json @@ -32,6 +32,9 @@ "typescript-eslint": "^8.24.1", "vite": "^6.2.0", "vitest": "^3.1.1" + }, + "optionalDependencies": { + "@rollup/rollup-linux-x64-gnu": "4.9.5" } }, "node_modules/@adobe/css-tools": { @@ -1485,13 +1488,12 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.39.0.tgz", - "integrity": "sha512-t9jqYw27R6Lx0XKfEFe5vUeEJ5pF3SGIM6gTfONSMb7DuG6z6wfj2yjcoZxHg129veTqU7+wOhY6GX8wmf90dA==", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.5.tgz", + "integrity": "sha512-Dq1bqBdLaZ1Gb/l2e5/+o3B18+8TI9ANlA1SkejZqDgdU/jK/ThYaMPMJpVMMXy2uRHvGKbkz9vheVGdq3cJfA==", "cpu": [ "x64" ], - "dev": true, "license": "MIT", "optional": true, "os": [ @@ -4685,6 +4687,20 @@ "fsevents": "~2.3.2" } }, + "node_modules/rollup/node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.39.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.39.0.tgz", + "integrity": "sha512-t9jqYw27R6Lx0XKfEFe5vUeEJ5pF3SGIM6gTfONSMb7DuG6z6wfj2yjcoZxHg129veTqU7+wOhY6GX8wmf90dA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, "node_modules/rrweb-cssom": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz", diff --git a/app/frontend/package.json b/app/frontend/package.json index 65af888..2cea4a8 100644 --- a/app/frontend/package.json +++ b/app/frontend/package.json @@ -36,5 +36,8 @@ "typescript-eslint": "^8.24.1", "vite": "^6.2.0", "vitest": "^3.1.1" + }, + "optionalDependencies": { + "@rollup/rollup-linux-x64-musl": "^3.28.0" } -} +} \ No newline at end of file