Skip to content

Commit f5be61c

Browse files
sandereggsanderegg
authored
♻️ Maintenance/Director-v2 to use settings library (ITISFoundation#2427)
1 parent 895b0f9 commit f5be61c

File tree

28 files changed

+289
-520
lines changed

28 files changed

+289
-520
lines changed

‎packages/settings-library/src/settings_library/docker_registry.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,7 @@ class RegistrySettings(BaseCustomSettings):
2626
@cached_property
2727
def resolved_registry_url(self) -> str:
2828
return self.REGISTRY_PATH or self.REGISTRY_URL
29+
30+
@cached_property
31+
def api_url(self) -> str:
32+
return f"{self.REGISTRY_URL}/v2"

‎services/director-v2/.env-devel‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ EXTRA_HOSTS_SUFFIX=undefined
1616
DIRECTOR_HOST=director
1717
DIRECTOR_PORT=8080
1818

19-
DIRECTOR_V2_REGISTRY_CACHING=True
20-
DIRECTOR_V2_REGISTRY_CACHING_TTL=900
2119
DIRECTOR_V2_SELF_SIGNED_SSL_SECRET_ID=1234
2220
DIRECTOR_V2_SELF_SIGNED_SSL_SECRET_NAME=1234
2321
DIRECTOR_V2_SELF_SIGNED_SSL_FILENAME=filename
@@ -36,12 +34,6 @@ POSTGRES_PORT=5432
3634
RABBIT_USER=admin
3735
RABBIT_PASSWORD=adminadmin
3836

39-
REGISTRY_URL=http://registry:5000
40-
REGISTRY_AUTH=False
41-
REGISTRY_USER=admin
42-
REGISTRY_PW=adminadmin
43-
REGISTRY_SSL=False
44-
4537
SIMCORE_SERVICES_NETWORK_NAME=interactive_services_subnet
4638

4739
STORAGE_ENDPOINT=http://storage:8080

‎services/director-v2/docker-compose-extra.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,7 @@ services:
3838
- 18080:8080
3939
depends_on:
4040
- postgres
41-
registry:
42-
image: registry:2
43-
init: true
44-
ports:
45-
- "5000:5000"
41+
4642

4743
# OPS ----------
4844
portainer:

‎services/director-v2/requirements/_base.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
# NOTE: ALL version constraints MUST be commented
55
--constraint ../../../requirements/constraints.txt
66

7+
--requirements ../../../packages/models-library/requirements/_base.in
8+
--requirements ../../../packages/settings-library/requirements/_base.in
9+
--requirements ../../../packages/postgres-database/requirements/_base.in
10+
711
# fastapi and extensions
812
fastapi[all]
913

‎services/director-v2/requirements/_base.txt‎

Lines changed: 59 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
#
2-
# This file is autogenerated by pip-compile
2+
# This file is autogenerated by pip-compile with python 3.8
33
# To update, run:
44
#
5-
# pip-compile --output-file=requirements/_base.txt requirements/_base.in
5+
# pip-compile --output-file=requirements/_base.txt --strip-extras requirements/_base.in
66
#
77
aiodocker==0.19.1
88
# via -r requirements/_base.in
99
aiofiles==0.5.0
1010
# via fastapi
1111
aiohttp==3.7.4.post0
1212
# via
13+
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
14+
# -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
15+
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
1316
# -c requirements/../../../requirements/constraints.txt
1417
# aiodocker
15-
aiopg[sa]==1.2.1
18+
aiopg==1.2.1
1619
# via -r requirements/_base.in
1720
amqp==5.0.2
1821
# via kombu
@@ -30,7 +33,7 @@ attrs==20.3.0
3033
# via aiohttp
3134
billiard==3.6.3.0
3235
# via celery
33-
celery[redis]==5.0.2
36+
celery==5.0.2
3437
# via -r requirements/_base.in
3538
certifi==2020.11.8
3639
# via
@@ -40,24 +43,32 @@ chardet==3.0.4
4043
# via
4144
# aiohttp
4245
# requests
43-
click-didyoumean==0.0.3
44-
# via celery
45-
click-repl==0.1.6
46-
# via celery
4746
click==7.1.2
4847
# via
4948
# celery
5049
# click-didyoumean
5150
# click-repl
51+
# typer
5252
# uvicorn
53+
click-didyoumean==0.0.3
54+
# via celery
55+
click-repl==0.1.6
56+
# via celery
57+
cloudpickle==1.6.0
58+
# via dask
59+
dask==2021.6.2
5360
decorator==4.4.2
5461
# via networkx
5562
dnspython==2.0.0
5663
# via email-validator
5764
email-validator==1.1.2
58-
# via fastapi
59-
fastapi[all]==0.65.0
65+
# via
66+
# fastapi
67+
# pydantic
68+
fastapi==0.65.0
6069
# via -r requirements/_base.in
70+
fsspec==2021.6.1
71+
# via dask
6172
graphene==2.1.8
6273
# via fastapi
6374
graphql-core==2.3.2
@@ -78,6 +89,8 @@ httpx==0.18.1
7889
# via -r requirements/_base.in
7990
idna==2.10
8091
# via
92+
# -r requirements/../../../packages/models-library/requirements/_base.in
93+
# -r requirements/../../../packages/postgres-database/requirements/_base.in
8194
# email-validator
8295
# requests
8396
# rfc3986
@@ -86,10 +99,15 @@ itsdangerous==1.1.0
8699
# via fastapi
87100
jinja2==2.11.3
88101
# via
102+
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
103+
# -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
104+
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
89105
# -c requirements/../../../requirements/constraints.txt
90106
# fastapi
91107
kombu==5.0.2
92108
# via celery
109+
locket==0.2.1
110+
# via partd
93111
markupsafe==1.1.1
94112
# via jinja2
95113
multidict==5.0.0
@@ -102,6 +120,8 @@ orjson==3.4.3
102120
# via
103121
# -r requirements/_base.in
104122
# fastapi
123+
partd==1.2.0
124+
# via dask
105125
promise==2.3
106126
# via
107127
# graphql-core
@@ -112,9 +132,14 @@ psycopg2-binary==2.8.6
112132
# via
113133
# aiopg
114134
# sqlalchemy
115-
pydantic[dotenv]==1.8.2
135+
pydantic==1.8.2
116136
# via
137+
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
138+
# -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
139+
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
117140
# -c requirements/../../../requirements/constraints.txt
141+
# -r requirements/../../../packages/models-library/requirements/_base.in
142+
# -r requirements/../../../packages/settings-library/requirements/_base.in
118143
# -r requirements/_base.in
119144
# fastapi
120145
python-dotenv==0.15.0
@@ -127,14 +152,18 @@ pytz==2020.4
127152
# via celery
128153
pyyaml==5.4.1
129154
# via
155+
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
156+
# -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
157+
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
130158
# -c requirements/../../../requirements/constraints.txt
159+
# dask
131160
# fastapi
132161
# uvicorn
133162
redis==3.5.3
134163
# via celery
135164
requests==2.25.1
136165
# via fastapi
137-
rfc3986[idna2008]==1.4.0
166+
rfc3986==1.4.0
138167
# via httpx
139168
rx==1.6.1
140169
# via graphql-core
@@ -150,14 +179,24 @@ sniffio==1.2.0
150179
# via
151180
# httpcore
152181
# httpx
153-
sqlalchemy[postgresql_psycopg2binary]==1.3.20
182+
sqlalchemy==1.3.20
154183
# via
184+
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
185+
# -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
186+
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
155187
# -c requirements/../../../requirements/constraints.txt
188+
# -r requirements/../../../packages/postgres-database/requirements/_base.in
156189
# aiopg
157190
starlette==0.14.2
158191
# via fastapi
159192
tenacity==6.2.0
160193
# via -r requirements/_base.in
194+
toolz==0.11.1
195+
# via
196+
# dask
197+
# partd
198+
typer==0.3.2
199+
# via -r requirements/../../../packages/settings-library/requirements/_base.in
161200
typing-extensions==3.7.4.3
162201
# via
163202
# aiodocker
@@ -167,9 +206,12 @@ ujson==4.0.2
167206
# via fastapi
168207
urllib3==1.26.5
169208
# via
209+
# -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
210+
# -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt
211+
# -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
170212
# -c requirements/../../../requirements/constraints.txt
171213
# requests
172-
uvicorn[standard]==0.13.4
214+
uvicorn==0.13.4
173215
# via fastapi
174216
uvloop==0.14.0
175217
# via uvicorn
@@ -184,4 +226,6 @@ wcwidth==0.2.5
184226
websockets==8.1
185227
# via uvicorn
186228
yarl==1.6.2
187-
# via aiohttp
229+
# via
230+
# -r requirements/../../../packages/postgres-database/requirements/_base.in
231+
# aiohttp

‎services/director-v2/requirements/_test.txt‎

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#
2-
# This file is autogenerated by pip-compile
2+
# This file is autogenerated by pip-compile with python 3.8
33
# To update, run:
44
#
5-
# pip-compile --output-file=requirements/_test.txt requirements/_test.in
5+
# pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in
66
#
77
aio-pika==6.8.0
88
# via -r requirements/_test.in
@@ -43,7 +43,7 @@ billiard==3.6.3.0
4343
# via
4444
# -c requirements/_base.txt
4545
# celery
46-
celery[redis]==5.0.2
46+
celery==5.0.2
4747
# via
4848
# -c requirements/_base.txt
4949
# pytest-celery
@@ -62,20 +62,20 @@ chardet==3.0.4
6262
# -c requirements/_base.txt
6363
# aiohttp
6464
# requests
65-
click-didyoumean==0.0.3
65+
click==7.1.2
6666
# via
6767
# -c requirements/_base.txt
6868
# celery
69-
click-repl==0.1.6
69+
# click-didyoumean
70+
# click-repl
71+
click-didyoumean==0.0.3
7072
# via
7173
# -c requirements/_base.txt
7274
# celery
73-
click==7.1.2
75+
click-repl==0.1.6
7476
# via
7577
# -c requirements/_base.txt
7678
# celery
77-
# click-didyoumean
78-
# click-repl
7979
codecov==2.1.11
8080
# via -r requirements/_test.in
8181
coverage==5.5
@@ -91,14 +91,14 @@ cryptography==3.4.7
9191
# paramiko
9292
distro==1.5.0
9393
# via docker-compose
94+
docker==5.0.0
95+
# via
96+
# -r requirements/_test.in
97+
# docker-compose
9498
docker-compose==1.29.1
9599
# via
96100
# -c requirements/../../../requirements/constraints.txt
97101
# pytest-docker
98-
docker[ssh]==5.0.0
99-
# via
100-
# -r requirements/_test.in
101-
# docker-compose
102102
dockerpty==0.4.1
103103
# via docker-compose
104104
docopt==0.6.2
@@ -156,7 +156,7 @@ multidict==5.0.0
156156
# -c requirements/_base.txt
157157
# aiohttp
158158
# yarl
159-
packaging==20.9
159+
packaging==21.0
160160
# via pytest
161161
pamqp==2.3.0
162162
# via aiormq
@@ -190,6 +190,16 @@ pyparsing==2.4.7
190190
# via packaging
191191
pyrsistent==0.17.3
192192
# via jsonschema
193+
pytest==6.2.4
194+
# via
195+
# -r requirements/_test.in
196+
# pytest-aiohttp
197+
# pytest-cov
198+
# pytest-docker
199+
# pytest-forked
200+
# pytest-icdiff
201+
# pytest-mock
202+
# pytest-xdist
193203
pytest-aiohttp==0.3.0
194204
# via -r requirements/_test.in
195205
pytest-celery==0.0.0
@@ -208,16 +218,6 @@ pytest-runner==5.3.1
208218
# via -r requirements/_test.in
209219
pytest-xdist==2.3.0
210220
# via -r requirements/_test.in
211-
pytest==6.2.4
212-
# via
213-
# -r requirements/_test.in
214-
# pytest-aiohttp
215-
# pytest-cov
216-
# pytest-docker
217-
# pytest-forked
218-
# pytest-icdiff
219-
# pytest-mock
220-
# pytest-xdist
221221
python-dateutil==2.8.1
222222
# via
223223
# alembic
@@ -237,10 +237,6 @@ pyyaml==5.4.1
237237
# -c requirements/../../../requirements/constraints.txt
238238
# -c requirements/_base.txt
239239
# docker-compose
240-
redis==3.5.3
241-
# via
242-
# -c requirements/_base.txt
243-
# celery
244240
requests==2.25.1
245241
# via
246242
# -c requirements/_base.txt
@@ -250,7 +246,7 @@ requests==2.25.1
250246
# docker-compose
251247
respx==0.17.0
252248
# via -r requirements/_test.in
253-
rfc3986[idna2008]==1.4.0
249+
rfc3986==1.4.0
254250
# via
255251
# -c requirements/_base.txt
256252
# httpx
@@ -270,7 +266,7 @@ sniffio==1.2.0
270266
# asgi-lifespan
271267
# httpcore
272268
# httpx
273-
sqlalchemy[postgresql_psycopg2binary]==1.3.20
269+
sqlalchemy==1.3.20
274270
# via
275271
# -c requirements/../../../requirements/constraints.txt
276272
# -c requirements/_base.txt

0 commit comments

Comments
 (0)