summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucent <98-lucent@users.noreply.activitypub.software>2024-05-15 13:53:31 +0200
committerLucent <98-lucent@users.noreply.activitypub.software>2024-05-15 13:53:31 +0200
commitab787b8fa68c3922e8ef35b9fe8da7d823a16556 (patch)
tree006c92865b1e4233e484d3827c25d3ed25aaea4b
parentlint (diff)
downloadsharkey-ab787b8fa68c3922e8ef35b9fe8da7d823a16556.tar.gz
sharkey-ab787b8fa68c3922e8ef35b9fe8da7d823a16556.tar.bz2
sharkey-ab787b8fa68c3922e8ef35b9fe8da7d823a16556.zip
Dockerfile: circumvent PEP-668 + fix check_connect.js path
-rw-r--r--Dockerfile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile
index cee1f03535..b937c69cdb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,8 +8,7 @@ RUN apk add git linux-headers build-base
ENV PYTHONUNBUFFERED=1
RUN apk add --update python3 && ln -sf python3 /usr/bin/python
-RUN python3 -m ensurepip
-RUN pip3 install --no-cache --upgrade pip setuptools
+RUN apk add py3-pip py3-setuptools
RUN corepack enable
@@ -65,7 +64,7 @@ COPY --chown=sharkey:sharkey --from=build /sharkey/sharkey-assets ./packages/fro
COPY --chown=sharkey:sharkey package.json ./package.json
COPY --chown=sharkey:sharkey pnpm-workspace.yaml ./pnpm-workspace.yaml
COPY --chown=sharkey:sharkey packages/backend/package.json ./packages/backend/package.json
-COPY --chown=sharkey:sharkey packages/backend/check_connect.js ./packages/backend/check_connect.js
+COPY --chown=sharkey:sharkey packages/backend/scripts/check_connect.js ./packages/backend/scripts/check_connect.js
COPY --chown=sharkey:sharkey packages/backend/ormconfig.js ./packages/backend/ormconfig.js
COPY --chown=sharkey:sharkey packages/backend/migration ./packages/backend/migration
COPY --chown=sharkey:sharkey packages/backend/assets ./packages/backend/assets