From c37a3536f14a2dadd46aaf83d1c67780e855dadc Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Thu, 18 Jan 2024 16:33:26 +0000 Subject: [PATCH] python2 removed --- Dockerfile.izumi-env-build | 10 ++++------ Dockerfile.izumi-env-runtime | 4 ---- lib/Dockerfile.common | 4 ++++ 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Dockerfile.izumi-env-build b/Dockerfile.izumi-env-build index 2e1ba74..9e543c7 100644 --- a/Dockerfile.izumi-env-build +++ b/Dockerfile.izumi-env-build @@ -1,8 +1,6 @@ # syntax = edrevo/dockerfile-plus -ARG V_UBUNTU=22.04 -FROM ubuntu:${V_UBUNTU} -ARG URELEASE=jammy + INCLUDE+ lib/Dockerfile.common @@ -46,8 +44,8 @@ RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \ nodejs yarn -RUN apt-get install -y --no-install-recommends \ - python-pip python-setuptools +# RUN apt-get install -y --no-install-recommends \ +# python-pip python-setuptools RUN apt-get install -y --no-install-recommends \ golang-${V_GOLANG} @@ -73,7 +71,7 @@ RUN curl -Lo /usr/local/bin/cs https://git.io/coursier-cli-linux && chmod +x /us RUN npm i -g typescript@${V_TYPESCRIPT} -RUN apt-get install -y --no-install-recommends python3-pip && \ +RUN apt-get install -y --no-install-recommends python3-setuptools python3-pip && \ pip3 install awscli RUN gem install sass && \ diff --git a/Dockerfile.izumi-env-runtime b/Dockerfile.izumi-env-runtime index cae78ac..38af344 100644 --- a/Dockerfile.izumi-env-runtime +++ b/Dockerfile.izumi-env-runtime @@ -1,9 +1,5 @@ # syntax = edrevo/dockerfile-plus -ARG V_UBUNTU=22.04 -FROM ubuntu:${V_UBUNTU} -ARG URELEASE=jammy - INCLUDE+ lib/Dockerfile.common INCLUDE+ lib/Dockerfile.common-java diff --git a/lib/Dockerfile.common b/lib/Dockerfile.common index 8cce002..2460b6d 100644 --- a/lib/Dockerfile.common +++ b/lib/Dockerfile.common @@ -1,3 +1,7 @@ +ARG V_UBUNTU=22.04 +FROM ubuntu:${V_UBUNTU} +ARG URELEASE=jammy + ### Both envs ARG V_GRAAL=21.0.2 ARG V_DOTNETSDK=7.0