From db9216b5a28a0f4928e3dc02cc2aa2d15018e981 Mon Sep 17 00:00:00 2001 From: Kevin Meinhardt Date: Tue, 28 Jan 2025 10:48:54 +0100 Subject: [PATCH] replace uWSGI with pyuwsgi (#23020) --- docker-compose.yml | 2 +- requirements/prod.txt | 58 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2d8883824a16..30f382d35946 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -87,7 +87,7 @@ services: extends: service: worker command: - - uwsgi --ini /data/olympia/docker/uwsgi.ini + - DJANGO_SETTINGS_MODULE=settings uwsgi --ini /data/olympia/docker/uwsgi.ini healthcheck: test: ["CMD-SHELL", "./manage.py monitors --services localdev_web --skip-checks"] interval: 30s diff --git a/requirements/prod.txt b/requirements/prod.txt index 507d61755053..eaf81ace78dd 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -132,8 +132,6 @@ six==1.17.0 \ urllib3==1.26.20 \ --hash=sha256:0ed14ccfbf1c30a9072c7ca157e4319b70d65f623e91e7b32fadb2853431016e \ --hash=sha256:40c2dc0c681e47eb8f90e7e27bf6ff7df2e677421fd46756da1161c39ca70d32 -uWSGI==2.0.28 \ - --hash=sha256:79ca1891ef2df14508ab0471ee8c0eb94bd2d51d03f32f90c4bbe557ab1e99d0 wheel==0.45.1 \ --hash=sha256:661e1abd9198507b1409a20c02106d9670b2576e916d58f520316666abca6729 \ --hash=sha256:708e7481cc80179af0e556bbf0cc00b8444c7321e2700b8d8580231d13017248 @@ -1225,3 +1223,59 @@ django-node-assets==0.9.14 \ Markdown==3.7 \ --hash=sha256:2ae2471477cfd02dbbf038d5d9bc226d40def84b4fe2986e49b59b6b472bbed2 \ --hash=sha256:7eb6df5690b81a1d7942992c97fad2938e956e79df20cbc6186e9c3a77b1c803 +pyuwsgi==2.0.28.post1 \ + --hash=sha256:06a0294910de374ff43032b41333f7f9b62d59308b7f3eea29bc64d78fb93613 \ + --hash=sha256:0b1c131288b6b473e39c5b02e63c34b64422665749dcadee41ef98d64b5db5d0 \ + --hash=sha256:1157f49bfb360c1883feec82553adbed1e4a447e5ced66f36525a92f0e46397e \ + --hash=sha256:1573ac212201ccbfea00b93d88fde89205d3c2f0a4d0c973058aa0b8745d4a2d \ + --hash=sha256:167d05f635c46287ee8709b09f422fbc16310acad3c9bd100a267679c061fe62 \ + --hash=sha256:1dbe7d0bb8184ef6c9bec1a3593a02bd27de0348807c97533069a7bca2603d19 \ + --hash=sha256:1e6afc8916098ca35119dc0c619f29ef572f72c6f4425f29604c17397ae313b2 \ + --hash=sha256:20d23ddbf28a831543d586c9e5727c9c28d7be7bd7cb853c7db2e0c529f605bf \ + --hash=sha256:219032fe8bb8306cb05e7bc509ff134c853cfcbd7d809a867d5b8ecd589bef5d \ + --hash=sha256:2300dba7037089a23b0eb4d2b037391be4d89b73e597671d0f23903a529cd552 \ + --hash=sha256:29c6f658625f2470d905276987aec898a690eee33f49c9c3961ca9d912abd046 \ + --hash=sha256:2c29fdf5baaff9d717aedb63e7b78b90bec561afc099f952db44699adcb0c575 \ + --hash=sha256:30798db4c0c9b36a12fd831cfe621c69569e226d177b3c28c6a191e2a819604f \ + --hash=sha256:327800fa58bfba5d6f2bd19331e812e0e1250aaa681874f5b92998f68e6bab75 \ + --hash=sha256:32838668eab84ac6847876d9da72768552fca556e09a1fe3a63facb976bd12ad \ + --hash=sha256:36d9c628067fc1c58534b800aacbb7499813b214cabe9128fb5ba79ad32ff9b9 \ + --hash=sha256:3b85217fd489d623512066ffed0cfc4c95bd3321655e9c6ea13cf6c7f064c9b0 \ + --hash=sha256:44bfebc678b2dde10382197b9199ce546b699a672e05e139a3827efb121e704f \ + --hash=sha256:4a4fbc27ccbe24cffb65ce89fbb7cf2e8a0af625b7706179786a810688cefd7f \ + --hash=sha256:4fcf8a76ad40af8c3c1a1e98f11be03e999e4957f48da6a180f5b8fc40b963c4 \ + --hash=sha256:5a90b72a25ba1a34299f4958237a12f18154b373a9a0a93a6267af5e8798c1ee \ + --hash=sha256:5b6bec34ca5b200dfc8b10c74b0a9e3da051747f5faa300f681bbb46cf573fd0 \ + --hash=sha256:5bdd7ec17f795049ef346dc10efbfce6c1a9500f3f39262c86107c70b9a83cb9 \ + --hash=sha256:5c2caedcc6fd0cd217b65ab863a51e18032b3ce81316d0a079652ed43ed8ba68 \ + --hash=sha256:6105bd14fa2e61505dc116574ba79f3f6e0f425f206d3bec2337463457167aba \ + --hash=sha256:611e6585a51b3a1f9619e1069dcdc1b8bf37ad7aa16b271fce2ca3e1440fc548 \ + --hash=sha256:64b40503a87621e79efe4306b77595a0cbcb69afa4f3428a85e4e8ac46068d88 \ + --hash=sha256:6c969668db4599b6a5c927ad4bc1d698ea8c57fb10a943b51402fe80a97cdfc9 \ + --hash=sha256:735861b77e607e133f9905a5e0ba6505ef6788df1cfdb6af06e6dfef07dfa9af \ + --hash=sha256:787fd67086df87921bc8837ef018cd7cf02834136f4735811375c1e17b776b40 \ + --hash=sha256:7e8fd6f2116d2afce52965c940a96a939e9d9c7409f3e19ba445a25e33779f08 \ + --hash=sha256:81e59789af3b568ed1c4484b4bac9e4b79810f4774d8d3ab9056eb3f500e1e94 \ + --hash=sha256:8dc521dd980ee431d4e6fc9a018ad1df4840c4551f281a598878083f3d155243 \ + --hash=sha256:91bdc9fcd1e13088ef57f7e58e427c9539e9d2c6d75157f55b5d17ef599e61ee \ + --hash=sha256:9390e8a2297186ede814d5863a06fa98b91295c813fdd3d08fe1357793476486 \ + --hash=sha256:941d44a67760dc173c0f8318f8b7bd1ef7927533d6efb4641b2ea9e934f09981 \ + --hash=sha256:9436ac4450730e1bcca4591ebb781eabcfcf93462114e199b951118032144323 \ + --hash=sha256:a1b0a27f1b9c63a1ac9788a068e5905b8ebedb1b460b9256ac85d1318fd6a9a6 \ + --hash=sha256:a8a932c9d34b2f0007eabf04728ffae7be8bfb87a044daee50a82b6796ad5b34 \ + --hash=sha256:a9382286b9cf94b5d826388cda7097235b0f1348c7549c8b71100ecfc8d74c58 \ + --hash=sha256:ad20990917364f8f9b3fc62424edc6d9a992146bc5e15d37b1bbc9c3934ddf9b \ + --hash=sha256:b2f118d7211e4afb7e8248cd380c1eac3e87604c1143bbccac1679c3a3642e22 \ + --hash=sha256:b351e76c9a18dc3e8a635994a98571b9ca7f10e371a0085ae3c8cd95f3db66cd \ + --hash=sha256:c0b1b09bdf836a6cacf35e2bb06f6ad4b7dff6c6ad48895e1b1c0b0d19bbbfcc \ + --hash=sha256:c9feafdfa73a632767a0cb1bafd285e36fba925b9c9ddd2b3311f2963c917c9f \ + --hash=sha256:cf4f03d8b74d9754efd8cc6b0566258ccc1123a8c2fe49a11835242a6fb27efc \ + --hash=sha256:dc85ba45af7a7b89e3a722cf9cbba724fabb2c3b5caf3c25d67286ab329df97c \ + --hash=sha256:e1289847ba14ae2ba4f918c57e9d257ecd82a43f6c7a026e155577596c6304f1 \ + --hash=sha256:e227836984735fdfa26d3be4927a6ae060ad8a0d28ef4a6adcd4f47fbfd7e876 \ + --hash=sha256:e4e4775246f2ab079ea4bcf69d70441ffe81eba82a88eb4da6ae9debf334511f \ + --hash=sha256:f27ee3445eab37fabbe3afc6af68220c8f0bd28c5228d6a2ec7886d080614ad4 \ + --hash=sha256:f4563fa76d64a2c309eb902511a1fcdce66865a03785c61494db5c53136ffa7a \ + --hash=sha256:f55071012ce5d728ac428be78c3710e986acc02dcfc1d72f3a76541b85e25cfb \ + --hash=sha256:f61adc1ab15da41675af36256feccd0cafb797c703499930fd5b3b381b0b6273 \ + --hash=sha256:fa60c4fb1e483c079d1f3767863bc41884f6322f0744ac5d6398b0e505e9d21e