Skip to content

Commit 2ad810c

Browse files
pcrespovpcrespov
authored
[maintenance] missing sync openapi, upgrades pip (#1354)
* Synced missing schema updates * Updates apk management Adds apk update in all dockers and basic client libs * upgrades pip to ~=20.0.0
1 parent d4410e6 commit 2ad810c

File tree

12 files changed

+86
-6
lines changed

12 files changed

+86
-6
lines changed

‎api/specs/common/schemas/node-meta-v0.0.1-converted.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ properties:
1818
description: distinctive name for the node based on the docker registry path
1919
pattern: '^(simcore)/(services)/(comp|dynamic)(/[^\s/]+)+$'
2020
example: simcore/services/comp/itis/sleeper
21+
integration-version:
22+
type: string
23+
description: integration version number
24+
pattern: >-
25+
^(0|[1-9]\d*)(\.(0|[1-9]\d*)){2}(-(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*)(\.(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*))*)?(\+[-\da-zA-Z]+(\.[-\da-zA-Z-]+)*)?$
26+
example: 1.0.0
2127
version:
2228
type: string
2329
description: semantic version number

‎scripts/openapi/oas_resolver/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ WORKDIR /src
1212

1313
# update pip
1414
RUN pip install --no-cache-dir --upgrade \
15-
pip~=19.1.1 \
15+
pip~=20.0.2 \
1616
wheel \
1717
setuptools
1818

‎services/catalog/Dockerfile

+11-1
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,24 @@ FROM base as build
3232

3333
ENV SC_BUILD_TARGET build
3434

35+
# Installing client libraries and any other package you need
36+
#
37+
# libpq: client library for PostgreSQL https://www.postgresql.org/docs/9.5/libpq.html
38+
# libstdc++: needed in ujson https://github.com/kohlschutter/junixsocket/issues/33
39+
#
40+
RUN apk update && \
41+
apk add --no-cache \
42+
libpq \
43+
libstdc++
44+
3545
RUN apk add --no-cache \
3646
alpine-sdk \
3747
python3-dev \
3848
musl-dev \
3949
postgresql-dev
4050

4151
RUN pip3 --no-cache-dir install --upgrade \
42-
pip \
52+
pip~=20.0.2 \
4353
wheel \
4454
setuptools
4555

‎services/director/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ RUN apk add --virtual .build-deps \
7070

7171

7272
RUN $SC_PIP install --upgrade \
73-
pip~=19.1.1 \
73+
pip~=20.0.2 \
7474
wheel \
7575
setuptools
7676

‎services/director/src/simcore_service_director/api/v0/openapi.yaml

+15
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,11 @@ paths:
161161
description: distinctive name for the node based on the docker registry path
162162
pattern: '^(simcore)/(services)/(comp|dynamic)(/[^\s/]+)+$'
163163
example: simcore/services/comp/itis/sleeper
164+
integration-version:
165+
type: string
166+
description: integration version number
167+
pattern: '^(0|[1-9]\d*)(\.(0|[1-9]\d*)){2}(-(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*)(\.(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*))*)?(\+[-\da-zA-Z]+(\.[-\da-zA-Z-]+)*)?$'
168+
example: 1.0.0
164169
version:
165170
type: string
166171
description: semantic version number
@@ -540,6 +545,11 @@ paths:
540545
description: distinctive name for the node based on the docker registry path
541546
pattern: '^(simcore)/(services)/(comp|dynamic)(/[^\s/]+)+$'
542547
example: simcore/services/comp/itis/sleeper
548+
integration-version:
549+
type: string
550+
description: integration version number
551+
pattern: '^(0|[1-9]\d*)(\.(0|[1-9]\d*)){2}(-(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*)(\.(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*))*)?(\+[-\da-zA-Z]+(\.[-\da-zA-Z-]+)*)?$'
552+
example: 1.0.0
543553
version:
544554
type: string
545555
description: semantic version number
@@ -1967,6 +1977,11 @@ components:
19671977
description: distinctive name for the node based on the docker registry path
19681978
pattern: '^(simcore)/(services)/(comp|dynamic)(/[^\s/]+)+$'
19691979
example: simcore/services/comp/itis/sleeper
1980+
integration-version:
1981+
type: string
1982+
description: integration version number
1983+
pattern: '^(0|[1-9]\d*)(\.(0|[1-9]\d*)){2}(-(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*)(\.(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*))*)?(\+[-\da-zA-Z]+(\.[-\da-zA-Z-]+)*)?$'
1984+
example: 1.0.0
19701985
version:
19711986
type: string
19721987
description: semantic version number

‎services/director/src/simcore_service_director/api/v0/schemas/node-meta-v0.0.1.json

+8
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@
2626
"simcore/services/dynamic/3dviewer"
2727
]
2828
},
29+
"integration-version": {
30+
"type": "string",
31+
"description": "integration version number",
32+
"pattern": "^(0|[1-9]\\d*)(\\.(0|[1-9]\\d*)){2}(-(0|[1-9]\\d*|\\d*[-a-zA-Z][-\\da-zA-Z]*)(\\.(0|[1-9]\\d*|\\d*[-a-zA-Z][-\\da-zA-Z]*))*)?(\\+[-\\da-zA-Z]+(\\.[-\\da-zA-Z-]+)*)?$",
33+
"examples": [
34+
"1.0.0"
35+
]
36+
},
2937
"version": {
3038
"type": "string",
3139
"description": "semantic version number",

‎services/sidecar/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN apk add --no-cache \
5151
libc-dev
5252

5353
RUN $SC_PIP install --upgrade \
54-
pip~=19.1.1 \
54+
pip~=20.0.2 \
5555
wheel \
5656
setuptools
5757

‎services/storage/Dockerfile

+11-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,16 @@ EXPOSE 8080
3737

3838
FROM base as build
3939

40+
# Installing client libraries and any other package you need
41+
#
42+
# libpq: client library for PostgreSQL https://www.postgresql.org/docs/9.5/libpq.html
43+
# libstdc++: needed in ujson https://github.com/kohlschutter/junixsocket/issues/33
44+
#
45+
RUN apk update && \
46+
apk add --no-cache \
47+
libpq \
48+
libstdc++
49+
4050
RUN apk add --no-cache \
4151
postgresql-dev \
4252
gcc \
@@ -46,7 +56,7 @@ RUN apk add --no-cache \
4656
linux-headers
4757

4858
RUN $SC_PIP install --upgrade \
49-
pip~=19.1.1 \
59+
pip~=20.0.2 \
5060
wheel \
5161
setuptools
5262

‎services/storage/src/simcore_service_storage/api/v0/schemas/node-meta-v0.0.1.json

+8
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@
2626
"simcore/services/dynamic/3dviewer"
2727
]
2828
},
29+
"integration-version": {
30+
"type": "string",
31+
"description": "integration version number",
32+
"pattern": "^(0|[1-9]\\d*)(\\.(0|[1-9]\\d*)){2}(-(0|[1-9]\\d*|\\d*[-a-zA-Z][-\\da-zA-Z]*)(\\.(0|[1-9]\\d*|\\d*[-a-zA-Z][-\\da-zA-Z]*))*)?(\\+[-\\da-zA-Z]+(\\.[-\\da-zA-Z-]+)*)?$",
33+
"examples": [
34+
"1.0.0"
35+
]
36+
},
2937
"version": {
3038
"type": "string",
3139
"description": "semantic version number",

‎services/web/Dockerfile

+11-1
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,24 @@ FROM base as build
4646

4747
ENV SC_BUILD_TARGET build
4848

49+
# Installing client libraries and any other package you need
50+
#
51+
# libpq: client library for PostgreSQL https://www.postgresql.org/docs/9.5/libpq.html
52+
# libstdc++: needed in ujson https://github.com/kohlschutter/junixsocket/issues/33
53+
#
54+
RUN apk update && \
55+
apk add --no-cache \
56+
libpq \
57+
libstdc++
58+
4959
RUN apk add --no-cache \
5060
postgresql-dev \
5161
gcc \
5262
libc-dev \
5363
libffi-dev
5464

5565
RUN $SC_PIP install --upgrade \
56-
pip~=19.1.1 \
66+
pip~=20.0.2 \
5767
wheel \
5868
setuptools
5969

‎services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -3378,6 +3378,11 @@ paths:
33783378
description: distinctive name for the node based on the docker registry path
33793379
pattern: '^(simcore)/(services)/(comp|dynamic)(/[^\s/]+)+$'
33803380
example: simcore/services/comp/itis/sleeper
3381+
integration-version:
3382+
type: string
3383+
description: integration version number
3384+
pattern: '^(0|[1-9]\d*)(\.(0|[1-9]\d*)){2}(-(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*)(\.(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*))*)?(\+[-\da-zA-Z]+(\.[-\da-zA-Z-]+)*)?$'
3385+
example: 1.0.0
33813386
version:
33823387
type: string
33833388
description: semantic version number

‎services/web/server/src/simcore_service_webserver/api/v0/schemas/node-meta-v0.0.1.json

+8
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@
2626
"simcore/services/dynamic/3dviewer"
2727
]
2828
},
29+
"integration-version": {
30+
"type": "string",
31+
"description": "integration version number",
32+
"pattern": "^(0|[1-9]\\d*)(\\.(0|[1-9]\\d*)){2}(-(0|[1-9]\\d*|\\d*[-a-zA-Z][-\\da-zA-Z]*)(\\.(0|[1-9]\\d*|\\d*[-a-zA-Z][-\\da-zA-Z]*))*)?(\\+[-\\da-zA-Z]+(\\.[-\\da-zA-Z-]+)*)?$",
33+
"examples": [
34+
"1.0.0"
35+
]
36+
},
2937
"version": {
3038
"type": "string",
3139
"description": "semantic version number",

0 commit comments

Comments
 (0)