From fa589c9523535cc3995c5975c594789d663ae44d Mon Sep 17 00:00:00 2001 From: Sergey Konovalov Date: Fri, 6 Jun 2025 17:45:07 +0300 Subject: [PATCH] [build] Bump Ubuntu to 20.04(Dockerfile); switch to @yao-pkg/pkg; For bug 74773 --- Dockerfile | 2 +- tools/linux/deps.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2d48ec9..0cd5a0a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:20.04 ENV TZ=Etc/UTC RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/tools/linux/deps.py b/tools/linux/deps.py index 687312e..479a2b1 100755 --- a/tools/linux/deps.py +++ b/tools/linux/deps.py @@ -67,7 +67,7 @@ def install_deps(): print("OK") base.cmd("sudo", ["apt-get", "-y", "install", "npm", "yarn"], True) base.cmd("sudo", ["npm", "install", "-g", "grunt-cli"]) - base.cmd("sudo", ["npm", "install", "-g", "pkg"]) + base.cmd("sudo", ["npm", "install", "-g", "@yao-pkg/pkg"]) # java java_error = base.cmd("sudo", ["apt-get", "-y", "install", "openjdk-11-jdk"], True)