Commit 955eccd4 authored by Kenzo-Hugo Hillion's avatar Kenzo-Hugo Hillion
Browse files

add flower and portainer and test celery

parent aaf9cf48
Pipeline #25266 failed with stages
in 3 minutes and 7 seconds
......@@ -153,11 +153,11 @@
},
"drf-yasg": {
"hashes": [
"sha256:4cfec631880ae527a91ec7cd3241aea2f82189f59e2f089119aa687761afb227",
"sha256:504cce09035cf1bace63b84d9d778b772f86bb37d8a71ed6f723346362e633b2"
"sha256:5572e9d5baab9f6b49318169df9789f7399d0e3c7bdac8fdb8dfccf1d5d2b1ca",
"sha256:7d7af27ad16e18507e9392b2afd6b218fbffc432ec8dbea053099a2241e184ff"
],
"index": "pypi",
"version": "==1.17.0"
"version": "==1.17.1"
},
"gunicorn": {
"hashes": [
......@@ -169,11 +169,11 @@
},
"idna": {
"hashes": [
"sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407",
"sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"
"sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb",
"sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa"
],
"index": "pypi",
"version": "==2.8"
"version": "==2.9"
},
"importlib-metadata": {
"hashes": [
......@@ -249,11 +249,11 @@
},
"marshmallow": {
"hashes": [
"sha256:7669b944d6233b81f68739d5826f1176c3841cc31cf6b856841083b5a72f5ca9",
"sha256:c9d277f6092f32300395fb83d343be9f61b5e99d66d22bae1e5e7cd82608fee6"
"sha256:3a94945a7461f2ab4df9576e51c97d66bee2c86155d3d3933fab752b31effab8",
"sha256:4b95c7735f93eb781dfdc4dded028108998cad759dda8dd9d4b5b4ac574cbf13"
],
"index": "pypi",
"version": "==3.4.0"
"version": "==3.5.0"
},
"metagenedb": {
"editable": true,
......@@ -335,38 +335,38 @@
},
"pyfastx": {
"hashes": [
"sha256:0591e6eae1bfa0b810869c53b9568d617d3e3958716aafafb67a0966c60aefc2",
"sha256:083decb8842aadf2f45f62ad24bae177c2cdd513fe87dd7c3a3ef1ef9d10165e",
"sha256:106739aa435fddfb5bd2b5decc7944d3d60781eead76db33223e98e6f2efe44e",
"sha256:1a046a7e9be2c2e61b8681856bb73bea6a3e0bdd13bb8d80e435afc5142373fa",
"sha256:51f35810d8838fe11f9f59c453abb6f339e02c43e6ae06c5869aa7d34eea0bb7",
"sha256:5af16d9fdf87eccc8eb2ecab5443471df024d34aed0b383ddc982b856ab568d8",
"sha256:5e83aa11a3ed0cdf8861845be1f15bc20a4dff18421b4ab41121d5ef0799eec8",
"sha256:5f1c69e2e3ea2ff57e8c0549e3c2f217ea2abf65fe0c6581cee97b62bc893eff",
"sha256:5feed90623534aa13a28da59c2f139d5bba11a759957ced9d106095183d6b280",
"sha256:728429244168d828661e40dcf38a42fa43511fbffa935b82de6906441fdc4fa2",
"sha256:79f252f6c8591524828233727b519dab1151fed978d44579222f1bb70a8a43cc",
"sha256:8012bb110f5c2699daf605af1454caa770f3f83bcc83881b8c69c556ea3cd52b",
"sha256:a9c179806d3c1e424701e80145bee9feaac624044a00f41e317d4ac3e40a3c51",
"sha256:aa27439c0677cf720c66e4651a8d1bdc31d68c6befd832a5f32cadfb2ae548e6",
"sha256:aadf1d72c6cd551f89eb0c413ab32debe5e2fa0e339538cd25e1844023c1f494",
"sha256:ae4b8f7d36377b4a9f061989e3180dc05123aacfc8d60ad7c89493a879fced22",
"sha256:bd685d9a7c34664a99ddf5003c831fa09e746fc7284bf79e14c5d0069a2c62af",
"sha256:c0c95252198f07727b4aa28bce34034116db6cc80825a88965ad95207d925a61",
"sha256:c65b0d7eab325b1e000619c6c98bd45a43ac84b2766209ef50dc96fd5959d425",
"sha256:c8536017acec478da300f99ed21b2efa5dc88b0230ddd1f0347eaf40808c86cc",
"sha256:c8e1256c5f24fb1ba98a528b38898c8c67e362df056a135bb0bce5a7059db3c0",
"sha256:cfbe01aba992565126b7320020bfdf07ef86f1459a02c2637074fed8e6c1d72f",
"sha256:d25e0d5e6a1977211be5c5b30619a187decba421c6edb854d1627f817862cdc8",
"sha256:d5ee6dc33ce948fea5f78602305e30204b3c9f0c13aa9eaf926084ae94c67e16",
"sha256:dc1fb97ab79155ff69180f50a3fc3e8fc8f09ada4fce981ae791c65dea91bb5b",
"sha256:df4378b8c0efe960c267c52dab34c74f0784b70afef048658f29171bafb2cddb",
"sha256:e0a03ec92994c5f1e5cfb192adbb81e5f0bab28929d60ac0fbf4db7c17bccdac",
"sha256:e4154e8f0c95f2abc02047ae262cb6e354bf8ec9377994fbb96afee5887a7ba5",
"sha256:f82e078b8e892a0d1839610fd66df3fbaf1c165b2e554bdb7d46bb815dc5c487"
"sha256:07e752f036c831ab73d73909a6790606cccb6bd99f1cd8dae1a2bed8ffc532fb",
"sha256:097bf98aa46e31bd0b451eedfc009cb29ecd1bd9d5153d11c18c506b29dc2f23",
"sha256:0a58c1e817a0e2cfb6ae6096635fa3fc67db4392d3a50c1b87bfc653963a3ae2",
"sha256:23fb03de7a451e992324ecf61d0bc12a60ceb68ee3731fb082fc8cd1c8c4134e",
"sha256:297ec1fcfd866a4d2698e35ddebda3d6a013286938a78222baee9bdfb1a33c6b",
"sha256:31d06261cc39d732f4c0e721a286af629171d1ab16e24cdcb4573868ca5947f5",
"sha256:42bc1fb976dd9dc19dcddba34b8eb256da778c68b057324d642b1863a70ce6c5",
"sha256:44f485e969490aee35c0ab8fa9109a5ea244e6719ab413b7346a39d2b1a04608",
"sha256:454b340fd700664667fe1da9373aa80cae7e2722c699b4b14e1de8c395bc93a2",
"sha256:4e6b63d83725cef5eb21b432b8c30940c08fd184e35ddab4dfe7f9dedd6a29a8",
"sha256:632970f67a22796dac95bf9a0fb24038421fc275be0bc7d5350b9c5f7d06ef26",
"sha256:6b05e8d400bf1315826f898bb070ea8f24f3b0c64ada0ebb5f867fc446c220a8",
"sha256:73339342c3afa0c69404e13272a0adbdd7197988a4fb357bacafcfbd594516a2",
"sha256:7eb5b22384a19f5e75088650dfa366f0c229995fb65c24df7f65498f26b20bf8",
"sha256:8c10f0eee82888f0a1a1f086a21453531d000b6c6238ea15e309f0ed79ee7751",
"sha256:aa031a39db9547d3f79c7e56826cbba662eda53630f4e5fd1d7754a8eddd9d70",
"sha256:b89544f57cf854f1406bdbadbbbbfa340ba61a45d785ab9b6c3fe0c90eb1dfda",
"sha256:bc30d6a70fdcd632b0e553efdd5e2059a26ca17ba26d92a47caaf9aca171311d",
"sha256:bc46e9974f80f2693ea43e36cd4c43bbb3c59d4cb1b2f704c71c6d3afd3a7951",
"sha256:bcd33f6a8e3b043fd7664b1ad0b6148d6cb13fa85914c0f7181a7662ed6a9f70",
"sha256:bcdebea176f5a0e69c0607e0d2855b95b94de6f50bf8ab465c2bf7f9ede99a55",
"sha256:bf70af1fd338d063a561bba5fe17d59f0a3725afa9ea96929775ad89759049a6",
"sha256:c6be563f51dd6df910635c28d4a43eae300d24449e4dc4239f8e440e7e62aea4",
"sha256:ca25f806c8a2dcd70d85579f54af4eacbafd923e21cf0e7004ef22aeec445287",
"sha256:ca4ba3eb2e9e2edf965c79865c13ebe951c5c2974d25d47e5977c723c64320a2",
"sha256:d334d21ab461e664f799606824e073298bdd9a59b70278b2deca3e3ad3f3c576",
"sha256:e8da1e3ddc84a982e0fbe93f3f8a2e0b1245bb813ac10be20c331725dce7fe4d",
"sha256:f186cf46410bba7bcf5e25ee830d1cc13e82e947f369ee77369b4dbb96cf3453",
"sha256:f1c01ec1c2a4f85e04b09f064af62d751c9f0d1c9003d059472c562a90e6de38"
],
"index": "pypi",
"version": "==0.6.5"
"version": "==0.6.6"
},
"pyjwt": {
"hashes": [
......@@ -416,18 +416,18 @@
},
"requests": {
"hashes": [
"sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4",
"sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31"
"sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee",
"sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6"
],
"index": "pypi",
"version": "==2.22.0"
"version": "==2.23.0"
},
"ruamel.yaml": {
"hashes": [
"sha256:9d59fa89985c55155d35c886663e357813404ae8f94638cb673135b8c8c1a7c7",
"sha256:dba517a7e330b6caf476b757022d21efa13c32694bfba1e057ce59a374f18f0a"
"sha256:0962fd7999e064c4865f96fb1e23079075f4a2a14849bcdc5cdba53a24f9759b",
"sha256:099c644a778bf72ffa00524f78dd0b6476bca94a1da344130f4bf3381ce5b954"
],
"version": "==0.16.7"
"version": "==0.16.10"
},
"ruamel.yaml.clib": {
"hashes": [
......@@ -451,7 +451,7 @@
"sha256:ed5b3698a2bb241b7f5cbbe277eaa7fe48b07a58784fba4f75224fd066d253ad",
"sha256:f9dcc1ae73f36e8059589b601e8e4776b9976effd76c21ad6a855a74318efd6e"
],
"markers": "platform_python_implementation == 'CPython' and python_version < '3.8'",
"markers": "platform_python_implementation == 'CPython' and python_version < '3.9'",
"version": "==0.2.0"
},
"six": {
......@@ -501,10 +501,10 @@
},
"zipp": {
"hashes": [
"sha256:5c56e330306215cd3553342cfafc73dda2c60792384117893f3a83f8a1209f50",
"sha256:d65287feb793213ffe11c0f31b81602be31448f38aeb8ffc2eb286c4f6f6657e"
"sha256:12248a63bbdf7548f89cb4c7cda4681e537031eda29c02ea29674bc6854460c2",
"sha256:7c0f8e91abc0dc07a5068f315c52cb30c66bfbc581e5b50704c8a2f6ebae794a"
],
"version": "==2.2.0"
"version": "==3.0.0"
}
},
"develop": {
......@@ -513,7 +513,7 @@
"sha256:5b26757dc6f79a3b7dc9fab95359328d5747fcb2409d331ea66d0272b90ab2a0",
"sha256:8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71"
],
"markers": "platform_system == 'Darwin'",
"markers": "sys_platform == 'darwin'",
"version": "==0.1.0"
},
"astroid": {
......@@ -548,10 +548,10 @@
},
"bleach": {
"hashes": [
"sha256:213336e49e102af26d9cde77dd2d0397afabc5a6bf2fed985dc35b5d1e285a16",
"sha256:3fdf7f77adcf649c9911387df51254b813185e32b2c6619f690b593a617e19fa"
"sha256:44f69771e2ac81ff30d929d485b7f9919f3ad6d019b6b20c74f3b8687c3f70df",
"sha256:aa8b870d0f46965bac2c073a93444636b0e1ca74e9777e34f03dd494b8a59d48"
],
"version": "==3.1.0"
"version": "==3.1.1"
},
"coverage": {
"hashes": [
......@@ -630,10 +630,10 @@
},
"faker": {
"hashes": [
"sha256:047d4d1791bfb3756264da670d99df13d799bb36e7d88774b1585a82d05dbaec",
"sha256:1b1a58961683b30c574520d0c739c4443e0ef6a185c04382e8cc888273dbebed"
"sha256:440d68fe0e46c1658b1975b2497abe0c24a7f772e3892253f31e713ffcc48965",
"sha256:ee24608768549c2c69e593e9d7a3b53c9498ae735534243ec8390cae5d529f8b"
],
"version": "==4.0.0"
"version": "==4.0.1"
},
"flake8": {
"hashes": [
......@@ -725,10 +725,10 @@
},
"jupyter-client": {
"hashes": [
"sha256:60e6faec1031d63df57f1cc671ed673dced0ed420f4377ea33db37b1c188b910",
"sha256:d0c077c9aaa4432ad485e7733e4d91e48f87b4f4bab7d283d42bb24cbbba0a0f"
"sha256:1fac6e3be1e797aea33d5cd1cfa568ff1ee71e01180bc89f64b24ee274f1f126",
"sha256:ed2490c65f7e0987d1e7b2c4146371d58112489e558b3a835aefb86b7283f930"
],
"version": "==5.3.4"
"version": "==6.0.0"
},
"jupyter-console": {
"hashes": [
......@@ -739,10 +739,10 @@
},
"jupyter-core": {
"hashes": [
"sha256:185dfe42800585ca860aa47b5fe0211ee2c33246576d2d664b0b0b8d22aacf3a",
"sha256:e91785b8bd7f752711c0c20e5ec6ba0d42178d6321a61396082c55818991caee"
"sha256:394fd5dd787e7c8861741880bdf8a00ce39f95de5d18e579c74b882522219e7e",
"sha256:a4ee613c060fe5697d913416fc9d553599c05e4492d58fac1192c9a6844abb21"
],
"version": "==4.6.2"
"version": "==4.6.3"
},
"kiwisolver": {
"hashes": [
......@@ -1061,36 +1061,36 @@
},
"pyzmq": {
"hashes": [
"sha256:01b588911714a6696283de3904f564c550c9e12e8b4995e173f1011755e01086",
"sha256:0573b9790aa26faff33fba40f25763657271d26f64bffb55a957a3d4165d6098",
"sha256:0fa82b9fc3334478be95a5566f35f23109f763d1669bb762e3871a8fa2a4a037",
"sha256:1e59b7b19396f26e360f41411a5d4603356d18871049cd7790f1a7d18f65fb2c",
"sha256:2a294b4f44201bb21acc2c1a17ff87fbe57b82060b10ddb00ac03e57f3d7fcfa",
"sha256:355b38d7dd6f884b8ee9771f59036bcd178d98539680c4f87e7ceb2c6fd057b6",
"sha256:4b73d20aec63933bbda7957e30add233289d86d92a0bb9feb3f4746376f33527",
"sha256:4ec47f2b50bdb97df58f1697470e5c58c3c5109289a623e30baf293481ff0166",
"sha256:5541dc8cad3a8486d58bbed076cb113b65b5dd6b91eb94fb3e38a3d1d3022f20",
"sha256:6fca7d11310430e751f9832257866a122edf9d7b635305c5d8c51f74a5174d3d",
"sha256:7369656f89878455a5bcd5d56ca961884f5d096268f71c0750fc33d6732a25e5",
"sha256:75d73ee7ca4b289a2a2dfe0e6bd8f854979fc13b3fe4ebc19381be3b04e37a4a",
"sha256:80c928d5adcfa12346b08d31360988d843b54b94154575cccd628f1fe91446bc",
"sha256:83ce18b133dc7e6789f64cb994e7376c5aa6b4aeced993048bf1d7f9a0fe6d3a",
"sha256:8b8498ceee33a7023deb2f3db907ca41d6940321e282297327a9be41e3983792",
"sha256:8c69a6cbfa94da29a34f6b16193e7c15f5d3220cb772d6d17425ff3faa063a6d",
"sha256:8ff946b20d13a99dc5c21cb76f4b8b253eeddf3eceab4218df8825b0c65ab23d",
"sha256:972d723a36ab6a60b7806faa5c18aa3c080b7d046c407e816a1d8673989e2485",
"sha256:a6c9c42bbdba3f9c73aedbb7671815af1943ae8073e532c2b66efb72f39f4165",
"sha256:aa3872f2ebfc5f9692ef8957fe69abe92d905a029c0608e45ebfcd451ad30ab5",
"sha256:cf08435b14684f7f2ca2df32c9df38a79cdc17c20dc461927789216cb43d8363",
"sha256:d30db4566177a6205ed1badb8dbbac3c043e91b12a2db5ef9171b318c5641b75",
"sha256:d5ac84f38575a601ab20c1878818ffe0d09eb51d6cb8511b636da46d0fd8949a",
"sha256:e37f22eb4bfbf69cd462c7000616e03b0cdc1b65f2d99334acad36ea0e4ddf6b",
"sha256:e6549dd80de7b23b637f586217a4280facd14ac01e9410a037a13854a6977299",
"sha256:ed6205ca0de035f252baa0fd26fdd2bc8a8f633f92f89ca866fd423ff26c6f25",
"sha256:efdde21febb9b5d7a8e0b87ea2549d7e00fda1936459cfb27fb6fca0c36af6c1",
"sha256:f4e72646bfe79ff3adbf1314906bbd2d67ef9ccc71a3a98b8b2ccbcca0ab7bec"
],
"version": "==18.1.1"
"sha256:0bbc1728fe4314b4ca46249c33873a390559edac7c217ec7001b5e0c34a8fb7f",
"sha256:1e076ad5bd3638a18c376544d32e0af986ca10d43d4ce5a5d889a8649f0d0a3d",
"sha256:242d949eb6b10197cda1d1cec377deab1d5324983d77e0d0bf9dc5eb6d71a6b4",
"sha256:26f4ae420977d2a8792d7c2d7bda43128b037b5eeb21c81951a94054ad8b8843",
"sha256:32234c21c5e0a767c754181c8112092b3ddd2e2a36c3f76fc231ced817aeee47",
"sha256:3f12ce1e9cc9c31497bd82b207e8e86ccda9eebd8c9f95053aae46d15ccd2196",
"sha256:4557d5e036e6d85715b4b9fdb482081398da1d43dc580d03db642b91605b409f",
"sha256:4f562dab21c03c7aa061f63b147a595dbe1006bf4f03213272fc9f7d5baec791",
"sha256:5e071b834051e9ecb224915398f474bfad802c2fff883f118ff5363ca4ae3edf",
"sha256:5e1f65e576ab07aed83f444e201d86deb01cd27dcf3f37c727bc8729246a60a8",
"sha256:5f10a31f288bf055be76c57710807a8f0efdb2b82be6c2a2b8f9a61f33a40cea",
"sha256:6aaaf90b420dc40d9a0e1996b82c6a0ff91d9680bebe2135e67c9e6d197c0a53",
"sha256:75238d3c16cab96947705d5709187a49ebb844f54354cdf0814d195dd4c045de",
"sha256:7f7e7b24b1d392bb5947ba91c981e7d1a43293113642e0d8870706c8e70cdc71",
"sha256:84b91153102c4bcf5d0f57d1a66a0f03c31e9e6525a5f656f52fc615a675c748",
"sha256:944f6bb5c63140d76494467444fd92bebd8674236837480a3c75b01fe17df1ab",
"sha256:a1f957c20c9f51d43903881399b078cddcf710d34a2950e88bce4e494dcaa4d1",
"sha256:a49fd42a29c1cc1aa9f461c5f2f5e0303adba7c945138b35ee7f4ab675b9f754",
"sha256:a99ae601b4f6917985e9bb071549e30b6f93c72f5060853e197bdc4b7d357e5f",
"sha256:ad48865a29efa8a0cecf266432ea7bc34e319954e55cf104be0319c177e6c8f5",
"sha256:b08e425cf93b4e018ab21dc8fdbc25d7d0502a23cc4fea2380010cf8cf11e462",
"sha256:bb10361293d96aa92be6261fa4d15476bca56203b3a11c62c61bd14df0ef89ba",
"sha256:bd1a769d65257a7a12e2613070ca8155ee348aa9183f2aadf1c8b8552a5510f5",
"sha256:cb3b7156ef6b1a119e68fbe3a54e0a0c40ecacc6b7838d57dd708c90b62a06dc",
"sha256:e8e4efb52ec2df8d046395ca4c84ae0056cf507b2f713ec803c65a8102d010de",
"sha256:f37c29da2a5b0c5e31e6f8aab885625ea76c807082f70b2d334d3fd573c3100a",
"sha256:f4d558bc5668d2345773a9ff8c39e2462dafcb1f6772a2e582fbced389ce527f",
"sha256:f5b6d015587a1d6f582ba03b226a9ddb1dfb09878b3be04ef48b01b7d4eb6b2a"
],
"version": "==19.0.0"
},
"qtconsole": {
"hashes": [
......@@ -1219,10 +1219,10 @@
},
"zipp": {
"hashes": [
"sha256:5c56e330306215cd3553342cfafc73dda2c60792384117893f3a83f8a1209f50",
"sha256:d65287feb793213ffe11c0f31b81602be31448f38aeb8ffc2eb286c4f6f6657e"
"sha256:12248a63bbdf7548f89cb4c7cda4681e537031eda29c02ea29674bc6854460c2",
"sha256:7c0f8e91abc0dc07a5068f315c52cb30c66bfbc581e5b50704c8a2f6ebae794a"
],
"version": "==2.2.0"
"version": "==3.0.0"
}
}
}
from .celery_app import app as celery_app # noqa
__all__ = ('celery_app')
......@@ -4,7 +4,7 @@ from rest_framework.routers import DefaultRouter, DynamicRoute, Route
from metagenedb.api.catalog import views
from metagenedb.api.catalog.views.celery_test import celery_test_view
from metagenedb.api.catalog.views.celery_test import celery_test_view, test_task_view
class CustomRouter(DefaultRouter):
......@@ -66,5 +66,6 @@ api_router.register(r'statistics', views.StatisticsViewSet, basename='statistics
urlpatterns = [
url(r'v1/', include((api_router.urls, 'v1'))),
path('admin/', include(('metagenedb.api.catalog.admin_urls', 'admin'))),
path('celery-test/', celery_test_view, name='celery-test')
path('celery-test/', celery_test_view, name='celery-test'),
path('celery-task-test/', test_task_view, name='celery-task-test')
]
from metagenedb.celery_app import debug_task
import logging
from celery import shared_task
from celery.decorators import task
from rest_framework.decorators import api_view
from rest_framework.response import Response
from metagenedb.celery_app import debug_task
logger = logging.getLogger(__name__)
@api_view()
def celery_test_view(request):
debug_task.delay()
return Response({"message": "Your task is being processed!"})
@task(name="test_celery_task")
def test_task(msg):
logger.info("Test Celery Task")
return msg
@task(name="poete")
def mul(x, y):
return x * y
@api_view()
def test_task_view(request):
msg = test_task.delay("poooouet")
muli = mul.delay(2, 4)
return Response({"message": f"Tested celery task: {msg.get(timeout=1)} {muli.get(timeout=1)}"})
import os
from celery import Celery
import time
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'metagenedb.settings')
app = Celery('metagenedb')
......@@ -10,6 +9,4 @@ app.autodiscover_tasks()
@app.task(bind=True)
def debug_task(self):
print("Doing async task")
time.sleep(2)
print("Task is done")
print('Request: {0!r}'.format(self.request))
......@@ -53,6 +53,8 @@ services:
depends_on:
- backend
- frontend
- flower
- portainer
volumes:
- ./nginx/dev/nginx.conf:/etc/nginx/nginx.conf:ro
- django-static:/usr/src/app/static
......@@ -80,7 +82,7 @@ services:
flower:
image: mher/flower
container_name: flower_dev_vet
container_name: flower
command: flower --url_prefix=flower
environment:
- CELERY_BROKER_URL=redis://redis:6379
......@@ -93,10 +95,21 @@ services:
- celery
- redis
portainer:
image: portainer/portainer
container_name: portainer
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- portainer-data:/data
ports:
- 9000:9000
networks:
- main
volumes:
postgresql-data:
django-static:
portainer-data:
networks:
main:
......
......@@ -21,6 +21,10 @@ http {
server flower:5555;
}
upstream portainer {
server portainer:9000;
}
server {
listen 80;
charset utf-8;
......@@ -63,5 +67,18 @@ http {
proxy_set_header Connection "upgrade";
}
# portainer
location /portainer/ {
proxy_http_version 1.1;
proxy_set_header Connection "";
proxy_pass http://portainer/;
}
location /portainer/api/websocket/ {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_http_version 1.1;
proxy_pass http://portainer/api/websocket/;
}
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment