x/tobiko
Code Issues Proposed changes

Use Fedora 34 for the lower-constraints and Infrared containers

Browse Source 
Change-Id: I9e3d5f1818d33672fd88a0317480530b8d3b3748
This commit is contained in:
Federico Ressi 2022-01-31 15:40:17 +01:00
parent 6370ee574d
commit 44af2753d4
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Dockerfile
View File

@ -1,15 +1,5 @@
ARG base_image=py39 ARG base_image=py39
FROM centos:8 as lower-constraints
ENV CONSTRAINS_FILE=lower-constraints.txt
ENV INSTALL_PACKAGES="dnf install -y"
ENV INSTALL_PACKAGES_GROUP="dnf groupinstall -y"
ENV PYTHON_VERSION=3
USER 0
FROM fedora:34 as py39 FROM fedora:34 as py39
ENV CONSTRAINS_FILE=upper-constraints.txt ENV CONSTRAINS_FILE=upper-constraints.txt
@ -17,8 +7,6 @@ ENV INSTALL_PACKAGES="dnf install -y"
ENV INSTALL_PACKAGES_GROUP="dnf groupinstall -y" ENV INSTALL_PACKAGES_GROUP="dnf groupinstall -y"
ENV PYTHON_VERSION=3.9 ENV PYTHON_VERSION=3.9
USER 0
FROM fedora:35 as py310 FROM fedora:35 as py310
@ -27,7 +15,10 @@ ENV INSTALL_PACKAGES="dnf install -y"
ENV INSTALL_PACKAGES_GROUP="dnf groupinstall -y" ENV INSTALL_PACKAGES_GROUP="dnf groupinstall -y"
ENV PYTHON_VERSION=3.10 ENV PYTHON_VERSION=3.10
USER 0
FROM py39 as lower-constraints
ENV CONSTRAINS_FILE=lower-constraints.txt
FROM ${base_image} as base FROM ${base_image} as base

7
infrared_plugin/Dockerfile
View File

@ -1,4 +1,4 @@
FROM centos:8 as base FROM fedora:34 as base
ENV TOBIKO_INFRARED_DIR /tobiko-infrared ENV TOBIKO_INFRARED_DIR /tobiko-infrared
ENV OPENSHIFT_INFRARED_URL=http://code.engineering.redhat.com/gerrit/openshift-ir-plugin.git ENV OPENSHIFT_INFRARED_URL=http://code.engineering.redhat.com/gerrit/openshift-ir-plugin.git
@ -9,7 +9,8 @@ ENV IR_EXTRA_ARGS ""
# Install common binary dependencies # Install common binary dependencies
RUN dnf install -y git python3 rsync which RUN dnf install -y git python3 rsync which
RUN python3 -m pip install --upgrade wheel setuptools pip RUN python3 -m ensurepip --upgrade
RUN python3 -m pip install --upgrade wheel setuptools
# Creates directories and use infrared home dir as home # Creates directories and use infrared home dir as home
RUN mkdir -p "${IR_HOME}" "${REPORT_DIR}" RUN mkdir -p "${IR_HOME}" "${REPORT_DIR}"
@ -21,7 +22,7 @@ FROM base as install
# Install wheels # Install wheels
ADD requirements.txt . ADD requirements.txt .
RUN pip install -r requirements.txt RUN python3 -m pip install -r requirements.txt
FROM base as configure FROM base as configure