Merge branch 'main' into PMM-12712-shards-info

percona · Dec 19, 2023 · 29d859b · 29d859b
2 parents 6c15ddd + 75fd4a0
commit 29d859b
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 46 deletions.
diff --git a/build/scripts/build-client-deb b/build/scripts/build-client-deb
@@ -9,7 +9,7 @@ bin_dir=$(cd $(dirname $0); pwd -P)
 tmp_dir=${root_dir}/tmp
 
 main() {
-    local IMAGE=${1:-ubuntu:xenial}
+    local IMAGE=${1:-ubuntu:focal}
     docker run --rm -e DEBIAN_FRONTEND=noninteractive \
                     -v ${bin_dir}:/home/builder/bin \
                     -v ${root_dir}/results:/home/builder/results ${IMAGE} sh -c "

diff --git a/build/scripts/build-client-sdeb b/build/scripts/build-client-sdeb
@@ -9,8 +9,10 @@ bin_dir=$(cd $(dirname $0); pwd -P)
 tmp_dir=${root_dir}/tmp
 
 main() {
-    local IMAGE=${1:-ubuntu:bionic}
-    docker run --rm -v ${bin_dir}:/home/builder/bin -v ${root_dir}/results:/home/builder/results ${IMAGE} sh -c "
+    local IMAGE=${1:-ubuntu:focal}
+    docker run --rm -e DEBIAN_FRONTEND=noninteractive \
+                    -v ${bin_dir}:/home/builder/bin \
+                    -v ${root_dir}/results:/home/builder/results ${IMAGE} sh -c "
         set -o errexit
         set -o xtrace
 

diff --git a/cli-tests/package-lock.json b/cli-tests/package-lock.json
diff --git a/cli-tests/package.json b/cli-tests/package.json
@@ -24,7 +24,7 @@
   "devDependencies": {
     "@types/promise-retry": "^1.1.3",
     "@types/shelljs": "^0.8.12",
-    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/eslint-plugin": "^6.15.0",
     "@typescript-eslint/parser": "^6.14.0",
     "eslint": "8.56",
     "eslint-config-airbnb-base": "^15.0.0",