From d81bb1aa628baf2a207eb7404db3a785d96e1444 Mon Sep 17 00:00:00 2001 From: Mizux Seiha Date: Tue, 24 Nov 2020 10:15:58 +0100 Subject: [PATCH] ci: Fix makefile Python dockers --- makefiles/docker/alpine/python.Dockerfile | 1 + makefiles/docker/archlinux/python.Dockerfile | 1 + makefiles/docker/centos/python.Dockerfile | 3 ++- makefiles/docker/debian/python.Dockerfile | 3 ++- makefiles/docker/fedora/python.Dockerfile | 4 ++-- makefiles/docker/opensuse/python.Dockerfile | 4 ++-- makefiles/docker/ubuntu/python.Dockerfile | 3 ++- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/makefiles/docker/alpine/python.Dockerfile b/makefiles/docker/alpine/python.Dockerfile index b346c58f35..7c02ebe88e 100644 --- a/makefiles/docker/alpine/python.Dockerfile +++ b/makefiles/docker/alpine/python.Dockerfile @@ -1,5 +1,6 @@ FROM ortools/make:alpine_swig AS env RUN apk add --no-cache python3-dev py3-pip py3-wheel +RUN python3 -m pip install absl-py FROM env AS devel WORKDIR /home/project diff --git a/makefiles/docker/archlinux/python.Dockerfile b/makefiles/docker/archlinux/python.Dockerfile index 4c09871404..1873629f6a 100644 --- a/makefiles/docker/archlinux/python.Dockerfile +++ b/makefiles/docker/archlinux/python.Dockerfile @@ -1,5 +1,6 @@ FROM ortools/make:archlinux_swig AS env RUN pacman -Syu --noconfirm python python-pip python-wheel +RUN python -m pip install absl-py FROM env AS devel WORKDIR /home/project diff --git a/makefiles/docker/centos/python.Dockerfile b/makefiles/docker/centos/python.Dockerfile index 8afe078376..9b1992b2d9 100644 --- a/makefiles/docker/centos/python.Dockerfile +++ b/makefiles/docker/centos/python.Dockerfile @@ -1,8 +1,9 @@ FROM ortools/make:centos_swig AS env RUN dnf -y update \ -&& dnf -y install python36-devel python3-wheel \ +&& dnf -y install python38-devel python38-pip python38-wheel \ && dnf clean all \ && rm -rf /var/cache/dnf +RUN python3 -m pip install absl-py FROM env AS devel WORKDIR /home/project diff --git a/makefiles/docker/debian/python.Dockerfile b/makefiles/docker/debian/python.Dockerfile index 64f52698ee..abb973f9cd 100644 --- a/makefiles/docker/debian/python.Dockerfile +++ b/makefiles/docker/debian/python.Dockerfile @@ -1,8 +1,9 @@ FROM ortools/make:debian_swig AS env RUN apt-get update -qq \ -&& apt-get install -yq python3-dev python3-pip python3-venv \ +&& apt-get install -yq python3-dev python3-pip python3-wheel python3-venv \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +RUN python3 -m pip install absl-py FROM env AS devel WORKDIR /home/project diff --git a/makefiles/docker/fedora/python.Dockerfile b/makefiles/docker/fedora/python.Dockerfile index 79e886398f..f223bc4aa4 100644 --- a/makefiles/docker/fedora/python.Dockerfile +++ b/makefiles/docker/fedora/python.Dockerfile @@ -1,8 +1,8 @@ FROM ortools/make:fedora_swig AS env RUN dnf -y update \ -&& dnf -y install \ - python3 python3-devel python3-pip python3-wheel \ +&& dnf -y install python3-devel python3-pip python3-wheel \ && dnf clean all +RUN python3 -m pip install absl-py FROM env AS devel WORKDIR /home/project diff --git a/makefiles/docker/opensuse/python.Dockerfile b/makefiles/docker/opensuse/python.Dockerfile index 730fd552ad..b30106304e 100644 --- a/makefiles/docker/opensuse/python.Dockerfile +++ b/makefiles/docker/opensuse/python.Dockerfile @@ -1,8 +1,8 @@ FROM ortools/make:opensuse_swig AS env RUN zypper update -y \ -&& zypper install -y \ - python3 python3-pip python3-devel python3-wheel \ +&& zypper install -y python3-devel python3-pip python3-wheel \ && zypper clean -a +RUN python3 -m pip install absl-py FROM env AS devel WORKDIR /home/project diff --git a/makefiles/docker/ubuntu/python.Dockerfile b/makefiles/docker/ubuntu/python.Dockerfile index d017b67ac1..1b786c47c8 100644 --- a/makefiles/docker/ubuntu/python.Dockerfile +++ b/makefiles/docker/ubuntu/python.Dockerfile @@ -1,8 +1,9 @@ FROM ortools/make:ubuntu_swig AS env RUN apt-get update -qq \ -&& apt-get install -yq python3-dev python3-pip python3-venv \ +&& apt-get install -yq python3-dev python3-pip python3-wheel python3-venv \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +RUN python3 -m pip install absl-py FROM env AS devel WORKDIR /home/project