From 9f0bffa2d7da1aaad70c36e8e293c864a3e2db71 Mon Sep 17 00:00:00 2001 From: Pedro Crespo Date: Mon, 9 Mar 2020 13:56:25 +0100 Subject: [PATCH 1/3] Synced missing schema updates --- .../schemas/node-meta-v0.0.1-converted.yaml | 6 ++++++ .../simcore_service_director/api/v0/openapi.yaml | 15 +++++++++++++++ .../api/v0/schemas/node-meta-v0.0.1.json | 8 ++++++++ .../api/v0/schemas/node-meta-v0.0.1.json | 8 ++++++++ .../simcore_service_webserver/api/v0/openapi.yaml | 5 +++++ .../api/v0/schemas/node-meta-v0.0.1.json | 8 ++++++++ 6 files changed, 50 insertions(+) diff --git a/api/specs/common/schemas/node-meta-v0.0.1-converted.yaml b/api/specs/common/schemas/node-meta-v0.0.1-converted.yaml index a5135b53878..acb8244240d 100644 --- a/api/specs/common/schemas/node-meta-v0.0.1-converted.yaml +++ b/api/specs/common/schemas/node-meta-v0.0.1-converted.yaml @@ -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 diff --git a/services/director/src/simcore_service_director/api/v0/openapi.yaml b/services/director/src/simcore_service_director/api/v0/openapi.yaml index fb3cb857d2f..55e20af3fc9 100644 --- a/services/director/src/simcore_service_director/api/v0/openapi.yaml +++ b/services/director/src/simcore_service_director/api/v0/openapi.yaml @@ -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 @@ -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 @@ -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 diff --git a/services/director/src/simcore_service_director/api/v0/schemas/node-meta-v0.0.1.json b/services/director/src/simcore_service_director/api/v0/schemas/node-meta-v0.0.1.json index b4978cbd794..2909aae313a 100644 --- a/services/director/src/simcore_service_director/api/v0/schemas/node-meta-v0.0.1.json +++ b/services/director/src/simcore_service_director/api/v0/schemas/node-meta-v0.0.1.json @@ -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", diff --git a/services/storage/src/simcore_service_storage/api/v0/schemas/node-meta-v0.0.1.json b/services/storage/src/simcore_service_storage/api/v0/schemas/node-meta-v0.0.1.json index b4978cbd794..2909aae313a 100644 --- a/services/storage/src/simcore_service_storage/api/v0/schemas/node-meta-v0.0.1.json +++ b/services/storage/src/simcore_service_storage/api/v0/schemas/node-meta-v0.0.1.json @@ -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", diff --git a/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml b/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml index f61e9f3001b..0f10936a74a 100644 --- a/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml +++ b/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml @@ -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 diff --git a/services/web/server/src/simcore_service_webserver/api/v0/schemas/node-meta-v0.0.1.json b/services/web/server/src/simcore_service_webserver/api/v0/schemas/node-meta-v0.0.1.json index b4978cbd794..2909aae313a 100644 --- a/services/web/server/src/simcore_service_webserver/api/v0/schemas/node-meta-v0.0.1.json +++ b/services/web/server/src/simcore_service_webserver/api/v0/schemas/node-meta-v0.0.1.json @@ -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", From 984a3b6273909c64a6a792b2ef6e3212f44b0e79 Mon Sep 17 00:00:00 2001 From: Pedro Crespo Date: Mon, 9 Mar 2020 13:58:46 +0100 Subject: [PATCH 2/3] Updates apk management Adds apk update in all dockers and basic client libs --- services/catalog/Dockerfile | 10 ++++++++++ services/storage/Dockerfile | 10 ++++++++++ services/web/Dockerfile | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/services/catalog/Dockerfile b/services/catalog/Dockerfile index c62bff3757d..6f231cc3870 100644 --- a/services/catalog/Dockerfile +++ b/services/catalog/Dockerfile @@ -32,6 +32,16 @@ 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 \ diff --git a/services/storage/Dockerfile b/services/storage/Dockerfile index fea2b89e0bd..0b1766db6fa 100644 --- a/services/storage/Dockerfile +++ b/services/storage/Dockerfile @@ -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 \ diff --git a/services/web/Dockerfile b/services/web/Dockerfile index 04aec36e255..78dc624e1c7 100644 --- a/services/web/Dockerfile +++ b/services/web/Dockerfile @@ -46,6 +46,16 @@ 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 \ From ccfcbfb7f20990d50c537847a150ed20d11a3a05 Mon Sep 17 00:00:00 2001 From: Pedro Crespo Date: Mon, 9 Mar 2020 14:01:00 +0100 Subject: [PATCH 3/3] upgrades pip to ~=20.0.0 --- scripts/openapi/oas_resolver/Dockerfile | 2 +- services/catalog/Dockerfile | 2 +- services/director/Dockerfile | 2 +- services/sidecar/Dockerfile | 2 +- services/storage/Dockerfile | 2 +- services/web/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/openapi/oas_resolver/Dockerfile b/scripts/openapi/oas_resolver/Dockerfile index 6f15455cccb..58420fbffed 100644 --- a/scripts/openapi/oas_resolver/Dockerfile +++ b/scripts/openapi/oas_resolver/Dockerfile @@ -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 diff --git a/services/catalog/Dockerfile b/services/catalog/Dockerfile index 6f231cc3870..48868012a0b 100644 --- a/services/catalog/Dockerfile +++ b/services/catalog/Dockerfile @@ -49,7 +49,7 @@ RUN apk add --no-cache \ postgresql-dev RUN pip3 --no-cache-dir install --upgrade \ - pip \ + pip~=20.0.2 \ wheel \ setuptools diff --git a/services/director/Dockerfile b/services/director/Dockerfile index f6a13b59b3b..97b58c0e804 100644 --- a/services/director/Dockerfile +++ b/services/director/Dockerfile @@ -65,7 +65,7 @@ RUN apk add --virtual .build-deps \ RUN $SC_PIP install --upgrade \ - pip~=19.1.1 \ + pip~=20.0.2 \ wheel \ setuptools diff --git a/services/sidecar/Dockerfile b/services/sidecar/Dockerfile index 0945d7afa71..71de3080257 100644 --- a/services/sidecar/Dockerfile +++ b/services/sidecar/Dockerfile @@ -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 diff --git a/services/storage/Dockerfile b/services/storage/Dockerfile index 0b1766db6fa..512ff02b9e6 100644 --- a/services/storage/Dockerfile +++ b/services/storage/Dockerfile @@ -56,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 diff --git a/services/web/Dockerfile b/services/web/Dockerfile index 78dc624e1c7..2849e7f513c 100644 --- a/services/web/Dockerfile +++ b/services/web/Dockerfile @@ -63,7 +63,7 @@ RUN apk add --no-cache \ libffi-dev RUN $SC_PIP install --upgrade \ - pip~=19.1.1 \ + pip~=20.0.2 \ wheel \ setuptools