Skip to content

Commit e79db8c

Browse files
committed
♻️ Update Dockerfile and dependencies, remove py-cord, and add paillcord
1 parent a279037 commit e79db8c

File tree

4 files changed

+78
-59
lines changed

4 files changed

+78
-59
lines changed

Dockerfile

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ COPY src pyproject.toml pdm.lock ./
1616

1717
RUN pdm export --prod -o requirements.txt --no-hashes
1818

19+
RUN awk '/^py-cord/ {skip=2; next} skip {skip--; next} 1' requirements.txt > requirements.txt.tmp && mv requirements.txt.tmp requirements.txt
20+
1921
FROM python:${PYTHON_VERSION}-slim-bookworm AS app
2022

2123
ENV PYTHONDONTWRITEBYTECODE=1
@@ -26,18 +28,15 @@ WORKDIR /app
2628
RUN adduser -u 6392 --disabled-password --gecos "" appuser && chown -R appuser /app
2729

2830
COPY --from=python-base --chown=appuser /app/requirements.txt ./
29-
COPY src/ ./src
30-
COPY LICENSE ./
31-
32-
RUN apt-get update \
33-
&& apt-get install -y --no-install-recommends \
34-
git \
35-
&& rm -rf /var/lib/apt/lists/* \
36-
&& apt-get clean
3731

3832
RUN pip install $(grep '^pycord-rest-bot==' requirements.txt | tr -d '\\') \
3933
&& sed -i '/pycord-rest-bot/d' requirements.txt \
40-
&& pip install -r requirements.txt
34+
&& pip uninstall py-cord -y \
35+
&& pip install -r requirements.txt \
36+
37+
COPY --chown=appuser src/ ./src
38+
COPY --chown=appuser LICENSE ./
39+
4140
USER appuser
4241

4342
CMD ["python", "src"]

pdm.lock

Lines changed: 23 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies = [
2222
"tortoise-orm[asyncpg]>=0.23.0",
2323
"aerich[toml]>=0.8.1",
2424
"pycord-rest-bot>=0.1.0a7",
25-
"git+https://github.com/Pycord-Development/pycord.git@refs/pull/2707/head",
25+
"paillcord>=2.7.0a3",
2626
]
2727
requires-python = "==3.12.*"
2828
readme = "README.md"

requirements.txt

Lines changed: 46 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# This file is @generated by PDM.
22
# Please do not edit it manually.
33

4-
aerich[toml]==0.8.2 \
5-
--hash=sha256:0ed2b15bb017785d17323329e5448b4b12fcfec08a20932626c12aa59a8378d6 \
6-
--hash=sha256:c1000cebd8525a1310a0cf0ea7d9a03cc2529413f182e90f08a6c6f4f61edcda
4+
aerich[toml]==0.9.1 \
5+
--hash=sha256:629afbef5902635c41f410dd05def984c02e05e62d8a2020210a29a4aae19001 \
6+
--hash=sha256:6ff34a2104454d03f7473dc99e7ad51f405a909c261126a1b8a52d44ca7b4cbc
77
aiocache[redis]==0.12.3 \
88
--hash=sha256:889086fc24710f431937b87ad3720a289f7fc31c4fd8b68e9f918b9bacd8270d \
99
--hash=sha256:f528b27bf4d436b497a1d0d1a8f59a542c153ab1e37c3621713cb376d44c4713
@@ -16,24 +16,25 @@ aiofiles==24.1.0 \
1616
aiohappyeyeballs==2.6.1 \
1717
--hash=sha256:c3f9d0113123803ccadfdf3f0faa505bc78e6a72d1cc4806cbd719826e943558 \
1818
--hash=sha256:f349ba8f4b75cb25c99c5c2d84e997e485204d2902a9597802b0371f09331fb8
19-
aiohttp==3.11.18 \
20-
--hash=sha256:0f421843b0f70740772228b9e8093289924359d306530bcd3926f39acbe1adda \
21-
--hash=sha256:11d5391946605f445ddafda5eab11caf310f90cdda1fd99865564e3164f5cff9 \
22-
--hash=sha256:12a62691eb5aac58d65200c7ae94d73e8a65c331c3a86a2e9670927e94339ee8 \
23-
--hash=sha256:364329f319c499128fd5cd2d1c31c44f234c58f9b96cc57f743d16ec4f3238c8 \
24-
--hash=sha256:3849ead845e8444f7331c284132ab314b4dac43bfae1e3cf350906d4fff4620f \
25-
--hash=sha256:3b8d2b42073611c860a37f718b3d61ae8b4c2b124b2e776e2c10619d920350ec \
26-
--hash=sha256:3cc314245deb311364884e44242e00c18b5896e4fe6d5f942e7ad7e4cb640adb \
27-
--hash=sha256:40fbf91f6a0ac317c0a07eb328a1384941872f6761f2e6f7208b63c4cc0a7ff6 \
28-
--hash=sha256:44ff5625413fec55216da5eaa011cf6b0a2ed67a565914a212a51aa3755b0009 \
29-
--hash=sha256:5e8452ad6b2863709f8b3d615955aa0807bc093c34b8e25b3b52097fe421cb7f \
30-
--hash=sha256:63d71eceb9cad35d47d71f78edac41fcd01ff10cacaa64e473d1aec13fa02df2 \
31-
--hash=sha256:7d0aebeb2392f19b184e3fdd9e651b0e39cd0f195cdb93328bd124a1d455cd0e \
32-
--hash=sha256:7f33a92a2fde08e8c6b0c61815521324fc1612f397abf96eed86b8e31618fdb4 \
33-
--hash=sha256:ab2ef72f8605046115bc9aa8e9d14fd49086d405855f40b79ed9e5c1f9f4faea \
34-
--hash=sha256:ae856e1138612b7e412db63b7708735cff4d38d0399f6a5435d3dac2669f558a \
35-
--hash=sha256:d1929da615840969929e8878d7951b31afe0bac883d84418f92e5755d7b49508 \
36-
--hash=sha256:e220e7562467dc8d589e31c1acd13438d82c03d7f385c9cd41a3f6d1d15807c1
19+
aiohttp==3.12.13 \
20+
--hash=sha256:050bd277dfc3768b606fd4eae79dd58ceda67d8b0b3c565656a89ae34525d15e \
21+
--hash=sha256:0aa580cf80558557285b49452151b9c69f2fa3ad94c5c9e76e684719a8791b73 \
22+
--hash=sha256:0f7df1f620ec40f1a7fbcb99ea17d7326ea6996715e78f71a1c9a021e31b96b8 \
23+
--hash=sha256:177f52420cde4ce0bb9425a375d95577fe082cb5721ecb61da3049b55189e4e6 \
24+
--hash=sha256:2637a60910b58f50f22379b6797466c3aa6ae28a6ab6404e09175ce4955b4e6a \
25+
--hash=sha256:29c955989bf4c696d2ededc6b0ccb85a73623ae6e112439398935362bacfaaf6 \
26+
--hash=sha256:3062d4ad53b36e17796dce1c0d6da0ad27a015c321e663657ba1cc7659cfc710 \
27+
--hash=sha256:47e2da578528264a12e4e3dd8dd72a7289e5f812758fe086473fab037a10fcce \
28+
--hash=sha256:4dc507481266b410dede95dd9f26c8d6f5a14315372cc48a6e43eac652237d9b \
29+
--hash=sha256:54fbbe6beafc2820de71ece2198458a711e224e116efefa01b7969f3e2b3ddae \
30+
--hash=sha256:671f41e6146a749b6c81cb7fd07f5a8356d46febdaaaf07b0e774ff04830461e \
31+
--hash=sha256:78f64e748e9e741d2eccff9597d09fb3cd962210e5b5716047cbb646dc8fe06f \
32+
--hash=sha256:8605e22d2a86b8e51ffb5253d9045ea73683d92d47c0b1438e11a359bdb94462 \
33+
--hash=sha256:8a94daa873465d518db073bd95d75f14302e0208a08e8c942b2f3f1c07288a75 \
34+
--hash=sha256:ac941a80aeea2aaae2875c9500861a3ba356f9ff17b9cb2dbfb5cbf91baaf5bf \
35+
--hash=sha256:b103a7e414b57e6939cc4dece8e282cfb22043efd0c7298044f6594cf83ab347 \
36+
--hash=sha256:d640191016763fab76072c87d8854a19e8e65d7a6fcfcbf017926bdbbb30a7e5 \
37+
--hash=sha256:e986067357550d1aaa21cfe9897fa19e680110551518a5a7cf44e6c5638cb8b5
3738
aiosignal==1.3.2 \
3839
--hash=sha256:45cde58e409a301715980c2b01d0c28bdde3770d8290b5eb2173759d9acb31a5 \
3940
--hash=sha256:a8c255c66fafb1e499c9351d0bf32ff2d8a0321595ebac3b93713656d2436f54
@@ -204,6 +205,9 @@ orjson==3.10.18 \
204205
--hash=sha256:e8da3947d92123eda795b68228cafe2724815621fe35e8e320a9e9593a4bcd53 \
205206
--hash=sha256:f3c29eb9a81e2fbc6fd7ddcfba3e101ba92eaff455b8d602bf7511088bbc0eae \
206207
--hash=sha256:f9f94cf6d3f9cd720d641f8399e390e7411487e493962213390d1ae45c7814fc
208+
paillcord==2.7.0a3 \
209+
--hash=sha256:32e46935a72ef4df1619f551b1464ba21c59db9b524dfe87177c8003510caec1 \
210+
--hash=sha256:76f553b48075ff633b7f6182e6238ff374bb7c55e512c9384dfea7bd546dd609
207211
priority==2.0.0 \
208212
--hash=sha256:6f8eefce5f3ad59baf2c080a664037bb4725cd0a790d53d59ab4059288faf6aa \
209213
--hash=sha256:c965d54f1b8d0d0b19479db3924c7c36cf672dbf2aec92d43fbdaf4492ba18c0
@@ -229,15 +233,15 @@ propcache==0.3.1 \
229233
py-cord==2.6.1 \
230234
--hash=sha256:36064f225f2c7bbddfe542d5ed581f2a5744f618e039093cf7cd2659a58bc79b \
231235
--hash=sha256:e3d3b528c5e37b0e0825f5b884cbb9267860976c1e4878e28b55da8fd3af834b
232-
pycord-rest-bot==0.1.0a9 \
233-
--hash=sha256:6dbaa4335d8f5b33a4b4034e9bc7ded0eae257eba57969830254635a6032a207 \
234-
--hash=sha256:96d77dafa63b69e6945ed89ce2cf45e69db9918fb4f9eea86d9335675b9906b1
236+
pycord-rest-bot==0.1.1 \
237+
--hash=sha256:3c0941577ef91f76a443a94557688db417b177dfbb197b190bf94b4209609301 \
238+
--hash=sha256:f6c44bc178b305fbc7e375f2cf2ac7b416112987ba8c0731a18b957724fd0a57
235239
pycparser==2.22 \
236240
--hash=sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6 \
237241
--hash=sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc
238-
pydantic==2.11.4 \
239-
--hash=sha256:32738d19d63a226a52eed76645a98ee07c1f410ee41d93b4afbfa85ed8111c2d \
240-
--hash=sha256:d9615eaa9ac5a063471da949c8fc16376a84afb5024688b3ff885693506764eb
242+
pydantic==2.11.7 \
243+
--hash=sha256:d989c3c6cb79469287b1569f7447a17848c998458d49ebe294e975b9baf0f0db \
244+
--hash=sha256:dde5df002701f6de26248661f6835bbe296a47bf73990135c7d07ce741b9623b
241245
pydantic-core==2.33.2 \
242246
--hash=sha256:3c6db6e52c6d70aa0d00d45cdb9b40f0433b96380071ea80b09277dba021ddf7 \
243247
--hash=sha256:4e61206137cbc65e6d5256e1166f88331d3b6238e082d9f74613b9b765fb9025 \
@@ -265,15 +269,15 @@ pynacl==1.5.0 \
265269
--hash=sha256:a36d4a9dda1f19ce6e03c9a784a2921a4b726b02e1c736600ca9c22029474394 \
266270
--hash=sha256:a422368fc821589c228f4c49438a368831cb5bbc0eab5ebe1d7fac9dded6567b \
267271
--hash=sha256:e46dae94e34b085175f8abb3b0aaa7da40767865ac82c928eeb9e57e1ea8a543
268-
pypika-tortoise==0.5.0; python_version < "4.0" \
269-
--hash=sha256:dbdc47eb52ce17407b05ce9f8560ce93b856d7b28beb01971d956b017846691f \
270-
--hash=sha256:ed0f56761868dc222c03e477578638590b972280b03c7c45cd93345b18b61f58
272+
pypika-tortoise==0.6.1; python_version < "4.0" \
273+
--hash=sha256:36ec2c88c255b9ed7ef49a6068cdeac10dafd4ddfeb828205d3afc092507fc3a \
274+
--hash=sha256:da15886f37b347e71f0869f9e4ee2f9259e6bb57455b45299c6c23d7927cbb6e
271275
pyreadline3==3.5.4; sys_platform == "win32" and python_version >= "3.8" \
272276
--hash=sha256:8d57d53039a1c75adba8e50dd3d992b28143480816187ea5efbd5c78e6c885b7 \
273277
--hash=sha256:eaf8e6cc3c49bcccf145fc6067ba8643d1df34d604a1ec0eccbf7a18e6d3fae6
274-
python-dotenv==1.1.0 \
275-
--hash=sha256:41f90bc6f5f177fb41f53e87666db362025010eb28f60a01c9143bfa33a2b2d5 \
276-
--hash=sha256:d7c01d9e2293916c18baf562d95698754b0dbbb5e74d457c45d4f6561fb9d55d
278+
python-dotenv==1.1.1 \
279+
--hash=sha256:31f23644fe2602f88ff55e1f5c79ba497e01224ee7737937930c448e4d0e24dc \
280+
--hash=sha256:a8a6399716257f45be6a007360200409fce5cda2661e3dec71d23dc15f6189ab
277281
pytz==2025.2 \
278282
--hash=sha256:360b9e3dbb49a209c21ad61809c7fb453643e048b38924c765813546746e81c3 \
279283
--hash=sha256:5ddf76296dd8c44c26eb8f4b6f35488f3ccbf6fbbd7adee0b7262d43f0ec2f00
@@ -294,9 +298,9 @@ quart==0.20.0 \
294298
redis==6.0.0 \
295299
--hash=sha256:5446780d2425b787ed89c91ddbfa1be6d32370a636c8fdb687f11b1c26c1fa88 \
296300
--hash=sha256:a2e040aee2cdd947be1fa3a32e35a956cd839cc4c1dbbe4b2cdee5b9623fd27c
297-
sentry-sdk==2.27.0 \
298-
--hash=sha256:90f4f883f9eff294aff59af3d58c2d1b64e3927b28d5ada2b9b41f5aeda47daf \
299-
--hash=sha256:c58935bfff8af6a0856d37e8adebdbc7b3281c2b632ec823ef03cd108d216ff0
301+
sentry-sdk==2.31.0 \
302+
--hash=sha256:e953f5ab083e6599bab255b75d6829b33b3ddf9931a27ca00b4ab0081287e84f \
303+
--hash=sha256:fed6d847f15105849cdf5dfdc64dcec356f936d41abb8c9d66adae45e60959ec
300304
sniffio==1.3.1 \
301305
--hash=sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2 \
302306
--hash=sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc
@@ -306,12 +310,12 @@ starlette==0.46.2 \
306310
tomli-w==1.2.0; python_version >= "3.11" \
307311
--hash=sha256:188306098d013b691fcadc011abd66727d3c414c571bb01b1a174ba8c983cf90 \
308312
--hash=sha256:2dd14fac5a47c27be9cd4c976af5a12d87fb1f0b4512f81d69cce3b35ae25021
309-
tortoise-orm[asyncpg]==0.25.0 \
310-
--hash=sha256:7d0aaf31c33a25a9efad8f94b44ee50febae15889f4da119cf184ffe98002673 \
311-
--hash=sha256:b853acae52bc309800ec2954f3e261746cdac7e6b0e0a96ba20393dcb100a357
312-
typing-extensions==4.13.2 \
313-
--hash=sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c \
314-
--hash=sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef
313+
tortoise-orm[asyncpg]==0.25.1 \
314+
--hash=sha256:4d5bfd13d5750935ffe636a6b25597c5c8f51c47e5b72d7509d712eda1a239fe \
315+
--hash=sha256:df0ef7e06eb0650a7e5074399a51ee6e532043308c612db2cac3882486a3fd9f
316+
typing-extensions==4.14.0 \
317+
--hash=sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4 \
318+
--hash=sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af
315319
typing-inspection==0.4.0 \
316320
--hash=sha256:50e72559fcd2a6367a19f7a7e610e6afcb9fac940c650290eed893d61386832f \
317321
--hash=sha256:9765c87de36671694a67904bf2c96e395be9c6439bb6c87b5142569dcdd65122

0 commit comments

Comments
 (0)