Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update container-builder to CentOS stream 9 #1019

Merged
merged 2 commits into from
Apr 25, 2024
Merged

Update container-builder to CentOS stream 9 #1019

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10d0c20
Update container-builder to CentOS stream 9
thom-at-redhat Apr 25, 2024
0752a78
Address reviewer comment
thom-at-redhat Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions tests/environments/container-builder/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM centos:8
FROM quay.io/centos/centos:stream9

# Python options = [3.8, 3.9]
ARG PYTHON_VERSION=3.8
# Python options = [3.9, 3.11, 3.12]
ARG PYTHON_VERSION=3.11

ENV PATH=${PATH}:/usr/local/go/bin

Expand All @@ -10,13 +10,20 @@ RUN set -x \
&& dnf update -y \
# Receptor build tools
&& dnf install -y \
git wget make iproute openssl findutils virtualenv \
findutils \
git \
iproute \
make \
openssl \
wget \
# Install specific python version
&& export PYTHON_PKG_NAME=python$(echo ${PYTHON_VERSION} | sed 's/\.//g') \
&& dnf module install -y ${PYTHON_PKG_NAME} \
&& alternatives --set python /usr/bin/python${PYTHON_VERSION} \
&& dnf install -y \
python${PYTHON_VERSION} \
python${PYTHON_VERSION}-pip \
&& pip${PYTHON_VERSION} install virtualenv \
# Install specific golang version
&& dnf install -y golang \
&& dnf install -y \
golang \
&& dnf clean all

# --- ALL IMAGE MUST BE THE SAME UNTIL NOW ---
Expand All @@ -25,16 +32,19 @@ RUN set -x \
WORKDIR /dependencies
ADD ./go.mod \
./go.sum \
./receptorctl/requirements/tests.txt \
./receptorctl/requirements/tests.in ./
../receptorctl/requirements/tests.txt \
../receptorctl/requirements/tests.in ./
RUN set -x \
# Go
&& go get -u golang.org/x/lint/golint \
&& go get -d -v ./... \
# Python
&& virtualenv -p python${PYTHON_VERSION} /opt/venv \
&& source /opt/venv/bin/activate \
&& pip3 install --upgrade -r requirements/tests.in -c requirements/tests.txt
&& pip${PYTHON_VERSION} install \
--upgrade \
-r tests.in \
-c tests.txt

ADD ./tests/environments/container-builder/build-artifacts.sh /

Expand Down
Loading