From 64986393191a3f62c1d0bb3ad75025f9946bab1d Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 9 Dec 2022 09:02:02 +0100 Subject: [PATCH 1/2] simulator: use ubuntu 22.04 in Dockerfile --- tools/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 4417555467c6..339f7bd40aae 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -17,7 +17,7 @@ # # CloudStack-simulator build -FROM ubuntu:20.04 +FROM ubuntu:22.04 MAINTAINER "Apache CloudStack" LABEL Vendor="Apache.org" License="ApacheV2" Version="4.18.0.0-SNAPSHOT" @@ -45,7 +45,7 @@ RUN apt-get -y update && apt-get install -y \ RUN apt-get install -qqy mysql-server && \ apt-get clean all && \ - mkdir /var/run/mysqld; \ + mkdir -p /var/run/mysqld; \ chown mysql /var/run/mysqld RUN echo '''sql_mode = "STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"''' >> /etc/mysql/mysql.conf.d/mysqld.cnf From 4410e2c64a566f85ffda117514936df9bba51f16 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 9 Jan 2023 12:51:55 +0100 Subject: [PATCH 2/2] PR6978 simulator: setup with nodejs 14 --- tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 339f7bd40aae..1933fef05323 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -67,7 +67,7 @@ RUN find /var/lib/mysql -type f -exec touch {} \; && \ ln -s /usr/bin/gcc-10 /usr/bin/x86_64-linux-gnu-gcc; \ pip3 install $MARVIN_FILE -RUN curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -; \ +RUN curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -; \ apt-get install -y nodejs; \ cd ui && npm rebuild node-sass && npm install