Skip to content

[maintenance] missing sync openapi, upgrades pip #1354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 9, 2020
Merged

[maintenance] missing sync openapi, upgrades pip #1354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9f0bffa
Synced missing schema updates
Mar 9, 2020
984a3b6
Updates apk management
Mar 9, 2020
ccfcbfb
upgrades pip to ~=20.0.0
Mar 9, 2020
b805b34
Merge branch 'master' into maintenace/march9
pcrespov Mar 9, 2020
6804be1
Merge branch 'master' into maintenace/march9
pcrespov Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions api/specs/common/schemas/node-meta-v0.0.1-converted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ properties:
description: distinctive name for the node based on the docker registry path
pattern: '^(simcore)/(services)/(comp|dynamic)(/[^\s/]+)+$'
example: simcore/services/comp/itis/sleeper
integration-version:
type: string
description: integration version number
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-]+)*)?$
example: 1.0.0
version:
type: string
description: semantic version number
Expand Down
2 changes: 1 addition & 1 deletion scripts/openapi/oas_resolver/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ WORKDIR /src

# update pip
RUN pip install --no-cache-dir --upgrade \
pip~=19.1.1 \
pip~=20.0.2 \
wheel \
setuptools

Expand Down
12 changes: 11 additions & 1 deletion services/catalog/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,24 @@ FROM base as build

ENV SC_BUILD_TARGET build

# Installing client libraries and any other package you need
#
# libpq: client library for PostgreSQL https://www.postgresql.org/docs/9.5/libpq.html
# libstdc++: needed in ujson https://github.com/kohlschutter/junixsocket/issues/33
#
RUN apk update && \
apk add --no-cache \
libpq \
libstdc++

RUN apk add --no-cache \
alpine-sdk \
python3-dev \
musl-dev \
postgresql-dev

RUN pip3 --no-cache-dir install --upgrade \
pip \
pip~=20.0.2 \
wheel \
setuptools

Expand Down
2 changes: 1 addition & 1 deletion services/director/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ RUN apk add --virtual .build-deps \


RUN $SC_PIP install --upgrade \
pip~=19.1.1 \
pip~=20.0.2 \
wheel \
setuptools

Expand Down
15 changes: 15 additions & 0 deletions services/director/src/simcore_service_director/api/v0/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,11 @@ paths:
description: distinctive name for the node based on the docker registry path
pattern: '^(simcore)/(services)/(comp|dynamic)(/[^\s/]+)+$'
example: simcore/services/comp/itis/sleeper
integration-version:
type: string
description: integration version number
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-]+)*)?$'
example: 1.0.0
version:
type: string
description: semantic version number
Expand Down Expand Up @@ -540,6 +545,11 @@ paths:
description: distinctive name for the node based on the docker registry path
pattern: '^(simcore)/(services)/(comp|dynamic)(/[^\s/]+)+$'
example: simcore/services/comp/itis/sleeper
integration-version:
type: string
description: integration version number
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-]+)*)?$'
example: 1.0.0
version:
type: string
description: semantic version number
Expand Down Expand Up @@ -1967,6 +1977,11 @@ components:
description: distinctive name for the node based on the docker registry path
pattern: '^(simcore)/(services)/(comp|dynamic)(/[^\s/]+)+$'
example: simcore/services/comp/itis/sleeper
integration-version:
type: string
description: integration version number
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-]+)*)?$'
example: 1.0.0
version:
type: string
description: semantic version number
Expand Down
8 changes: 8 additions & 0 deletions services/director/src/simcore_service_director/api/v0/schemas/node-meta-v0.0.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@
"simcore/services/dynamic/3dviewer"
]
},
"integration-version": {
"type": "string",
"description": "integration version number",
"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-]+)*)?$",
"examples": [
"1.0.0"
]
},
"version": {
"type": "string",
"description": "semantic version number",
Expand Down
2 changes: 1 addition & 1 deletion services/sidecar/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ RUN apk add --no-cache \
libc-dev

RUN $SC_PIP install --upgrade \
pip~=19.1.1 \
pip~=20.0.2 \
wheel \
setuptools

Expand Down
12 changes: 11 additions & 1 deletion services/storage/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,16 @@ EXPOSE 8080

FROM base as build

# Installing client libraries and any other package you need
#
# libpq: client library for PostgreSQL https://www.postgresql.org/docs/9.5/libpq.html
# libstdc++: needed in ujson https://github.com/kohlschutter/junixsocket/issues/33
#
RUN apk update && \
apk add --no-cache \
libpq \
libstdc++

RUN apk add --no-cache \
postgresql-dev \
gcc \
Expand All @@ -46,7 +56,7 @@ RUN apk add --no-cache \
linux-headers

RUN $SC_PIP install --upgrade \
pip~=19.1.1 \
pip~=20.0.2 \
wheel \
setuptools

Expand Down
8 changes: 8 additions & 0 deletions services/storage/src/simcore_service_storage/api/v0/schemas/node-meta-v0.0.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@
"simcore/services/dynamic/3dviewer"
]
},
"integration-version": {
"type": "string",
"description": "integration version number",
"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-]+)*)?$",
"examples": [
"1.0.0"
]
},
"version": {
"type": "string",
"description": "semantic version number",
Expand Down
12 changes: 11 additions & 1 deletion services/web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,24 @@ FROM base as build

ENV SC_BUILD_TARGET build

# Installing client libraries and any other package you need
#
# libpq: client library for PostgreSQL https://www.postgresql.org/docs/9.5/libpq.html
# libstdc++: needed in ujson https://github.com/kohlschutter/junixsocket/issues/33
#
RUN apk update && \
apk add --no-cache \
libpq \
libstdc++

RUN apk add --no-cache \
postgresql-dev \
gcc \
libc-dev \
libffi-dev

RUN $SC_PIP install --upgrade \
pip~=19.1.1 \
pip~=20.0.2 \
wheel \
setuptools

Expand Down
5 changes: 5 additions & 0 deletions services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3378,6 +3378,11 @@ paths:
description: distinctive name for the node based on the docker registry path
pattern: '^(simcore)/(services)/(comp|dynamic)(/[^\s/]+)+$'
example: simcore/services/comp/itis/sleeper
integration-version:
type: string
description: integration version number
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-]+)*)?$'
example: 1.0.0
version:
type: string
description: semantic version number
Expand Down
8 changes: 8 additions & 0 deletions services/web/server/src/simcore_service_webserver/api/v0/schemas/node-meta-v0.0.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@
"simcore/services/dynamic/3dviewer"
]
},
"integration-version": {
"type": "string",
"description": "integration version number",
"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-]+)*)?$",
"examples": [
"1.0.0"
]
},
"version": {
"type": "string",
"description": "semantic version number",
Expand Down