From 5071bf7312816d3a566369ffcda180dbd5b11875 Mon Sep 17 00:00:00 2001 From: Francois Ferrand Date: Fri, 20 Sep 2024 15:29:56 +0200 Subject: [PATCH] Enforce scubaclient version Keep the version from lockfile, pending a proper release. It also seems "latest" changes cannot be integrated at the moment. Also, need to use specific version of typescript, as scubaclient does not (reportedly) support latest releases (5.x). Issue: CLDSRV-562 --- Dockerfile | 2 +- package.json | 2 +- yarn.lock | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1e05672538..029019a244 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN apt-get update \ ENV PYTHON=python3 COPY package.json yarn.lock /usr/src/app/ -RUN npm install typescript -g +RUN npm install typescript@4.9.5 -g RUN yarn install --production --ignore-optional --frozen-lockfile --ignore-engines --network-concurrency 1 ################################################################################ diff --git a/package.json b/package.json index f57047eaf9..e989e1ace9 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "npm-run-all": "~4.1.5", "prom-client": "14.2.0", "request": "^2.81.0", - "scubaclient": "git+https://github.com/scality/scubaclient.git", + "scubaclient": "git+https://github.com/scality/scubaclient.git#fb7375a9298bda7df0e9f9ed81d7fc5b363590a9", "sql-where-parser": "~2.2.1", "utapi": "github:scality/utapi#8.1.15", "utf-8-validate": "^5.0.8", diff --git a/yarn.lock b/yarn.lock index 586dc4ec03..7d4ff9f95b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5302,7 +5302,7 @@ sax@>=0.6.0, sax@^1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -"scubaclient@git+https://github.com/scality/scubaclient.git": +"scubaclient@git+https://github.com/scality/scubaclient.git#fb7375a9298bda7df0e9f9ed81d7fc5b363590a9": version "1.0.0" resolved "git+https://github.com/scality/scubaclient.git#fb7375a9298bda7df0e9f9ed81d7fc5b363590a9" dependencies: