From 0aa7c23b6e44334cf0f6467e5fb759a8cafa610b Mon Sep 17 00:00:00 2001 From: Leo Date: Sat, 20 Apr 2024 14:58:22 +0900 Subject: [PATCH 1/6] Update Dockerfile --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 5449b80..9eca0a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,3 +17,6 @@ FROM clang_setup AS vcpkg_setup RUN git clone https://github.com/Microsoft/vcpkg.git /vcpkg RUN /vcpkg/bootstrap-vcpkg.sh ENV VCPKG_INSTALLATION_ROOT=/vcpkg + +FROM vcpkg_setup AS final +RUN pip install cmakelang From 2ff146b236d2d4bfbd2c117218930afbe42d8301 Mon Sep 17 00:00:00 2001 From: Leo Date: Sat, 20 Apr 2024 15:00:58 +0900 Subject: [PATCH 2/6] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9eca0a6..ab9f8ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,4 +19,4 @@ RUN /vcpkg/bootstrap-vcpkg.sh ENV VCPKG_INSTALLATION_ROOT=/vcpkg FROM vcpkg_setup AS final -RUN pip install cmakelang +RUN pip3 install cmakelang From 42ee952aba5ebc8f27e07b5cf87a5ac0f6595c9d Mon Sep 17 00:00:00 2001 From: Leo Date: Sat, 20 Apr 2024 15:03:18 +0900 Subject: [PATCH 3/6] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ab9f8ed..0710429 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,4 +19,5 @@ RUN /vcpkg/bootstrap-vcpkg.sh ENV VCPKG_INSTALLATION_ROOT=/vcpkg FROM vcpkg_setup AS final -RUN pip3 install cmakelang +RUN python -m ensurepip --upgrade +RUN pip install cmakelang From f1fda2eb67f0f63bf55d7bdbcc38c93f08022cec Mon Sep 17 00:00:00 2001 From: Leo Date: Sat, 20 Apr 2024 15:06:38 +0900 Subject: [PATCH 4/6] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0710429..5876506 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:22.04 AS base RUN apt-get update -RUN apt-get -y install wget build-essential cmake git software-properties-common curl zip unzip tar pkg-config +RUN apt-get -y install wget build-essential cmake git software-properties-common curl zip unzip tar pkg-config python FROM base AS clang_setup RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - From 5cd1b1f0d1da81879259a91c26d49a3bc6b3bb3d Mon Sep 17 00:00:00 2001 From: Leo Date: Sat, 20 Apr 2024 15:07:39 +0900 Subject: [PATCH 5/6] Update Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5876506..ccbf53b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:22.04 AS base RUN apt-get update -RUN apt-get -y install wget build-essential cmake git software-properties-common curl zip unzip tar pkg-config python +RUN apt-get -y install wget build-essential cmake git software-properties-common curl zip unzip tar pkg-config python3 FROM base AS clang_setup RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - @@ -19,5 +19,5 @@ RUN /vcpkg/bootstrap-vcpkg.sh ENV VCPKG_INSTALLATION_ROOT=/vcpkg FROM vcpkg_setup AS final -RUN python -m ensurepip --upgrade -RUN pip install cmakelang +RUN python3 -m ensurepip --upgrade +RUN pip3 install cmakelang From 0ec78c45268518cf646ff6ec1c31c46b7e71eb97 Mon Sep 17 00:00:00 2001 From: Leo Date: Sat, 20 Apr 2024 15:11:09 +0900 Subject: [PATCH 6/6] Update Dockerfile --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ccbf53b..a0e80a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:22.04 AS base RUN apt-get update -RUN apt-get -y install wget build-essential cmake git software-properties-common curl zip unzip tar pkg-config python3 +RUN apt-get -y install wget build-essential cmake git software-properties-common curl zip unzip tar pkg-config python3 python3-pip FROM base AS clang_setup RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - @@ -19,5 +19,4 @@ RUN /vcpkg/bootstrap-vcpkg.sh ENV VCPKG_INSTALLATION_ROOT=/vcpkg FROM vcpkg_setup AS final -RUN python3 -m ensurepip --upgrade RUN pip3 install cmakelang