Skip to content

Commit

Permalink
Merge pull request #9799 from OdedViner/upgrade_image_os
Browse files Browse the repository at this point in the history
Upgrade OCS-CI container image from rhel8 to rhel9
  • Loading branch information
petr-balogh authored Jun 3, 2024
2 parents f87c8e2 + 2fdeb84 commit 037c5fa
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 5 deletions.
22 changes: 22 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,25 @@
.venv/
venv/
data/
*~
.*.sw[nmop]
*.pyc
.tox
__pycache__
rerun
ven*
*egg*
.idea
*.iml
config.yaml
.vscode
*.bak
openshift-install*
bin/
dist
.coverage
data/*
external/
apidoc/*
_build/*
bugzilla.cfg
9 changes: 4 additions & 5 deletions Docker_files/ocsci_container/Containerfile.ci
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.access.redhat.com/ubi8/ubi:latest as BUILDER
FROM registry.access.redhat.com/ubi9/ubi:latest as BUILDER

ENV OCS_CI_DIR=/opt/ocs-ci
WORKDIR "${OCS_CI_DIR}"

RUN dnf install --nodocs -y python38 python38-devel git libcurl-devel gcc openssl-devel libxml2-devel
RUN dnf install --nodocs -y python39 python3.9-devel git libcurl-devel gcc openssl-devel libxml2-devel

# Copy the entire source tree to the image
# TODO: Check to see if there are any more files we can drop from the image
Expand All @@ -16,13 +16,12 @@ RUN pushd "${OCS_CI_DIR}" \
&& python3 -m venv venv \
&& source venv/bin/activate \
&& pip3 install --upgrade pip \
&& pip3 install setuptools==65.5.0 \
&& pip3 install -r requirements.txt \
&& rm -rf .git

### Runner stage

FROM registry.access.redhat.com/ubi8/ubi:latest as RUNNER
FROM registry.access.redhat.com/ubi9/ubi:latest as RUNNER

ENV OCS_CI_DIR="/opt/ocs-ci" \
VIRTUAL_ENV="/opt/ocs-ci/venv" \
Expand All @@ -37,7 +36,7 @@ RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/s

RUN curl https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-client-linux.tar.gz | tar -C /usr/local/bin -zxvf - oc

RUN dnf install -y --nodocs python38 git jq rsync make \
RUN dnf install -y --nodocs python39 git jq rsync make \
&& dnf clean all \
&& rm -rf /var/cache/yum /var/cache/dnf /var/lib/dnf/repos /var/log/dnf.librepo.log /var/log/dnf.log /var/log/dnf.rpm.log /var/log/hawkey.log /var/cache/ldconfig \
&& curl -sL https://github.com/mikefarah/yq/releases/download/v4.32.2/yq_linux_amd64.tar.gz | tar -C /usr/local/bin -zxvf - ./yq_linux_amd64 \
Expand Down

0 comments on commit 037c5fa

Please sign in to comment.