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

RHCLOUD-35257 - ubi8 to ubi9 update #268

Merged
merged 7 commits into from
Mar 11, 2025
Merged

RHCLOUD-35257 - ubi8 to ubi9 update #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2c45a0d
ubi8 to ubi9 update
EvanCasey13 Feb 20, 2025
4095aa2
add pip install to docker files and missing -y flag to nginx docker
EvanCasey13 Feb 25, 2025
6c057e0
add pip install to docker file
EvanCasey13 Feb 25, 2025
2b0f6a9
docker file pr check add pip install
EvanCasey13 Feb 25, 2025
492c209
correct pip install
EvanCasey13 Feb 26, 2025
91f54be
docker file update
EvanCasey13 Mar 11, 2025
de87271
readd pip to docker file pr check
EvanCasey13 Mar 11, 2025
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
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1179
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5-1739420147

ENV FLASK_RUN_HOST 0.0.0.0
ENV BACKENDS_CONFIG_MAP=/etc/turnpike/backends.yml
Expand All @@ -7,7 +7,7 @@ WORKDIR /usr/src/app

COPY Pipfile.lock /usr/src/app/

RUN microdnf install --nodocs -y gcc xmlsec1 python39 xmlsec1-openssl openssl
RUN microdnf install --nodocs -y gcc xmlsec1 python39 pip xmlsec1-openssl openssl
RUN pip3 install --upgrade pip && \
pip3 install micropipenv && \
micropipenv install && \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-pr-check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1179
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5-1739420147

WORKDIR /usr/src/app

COPY Pipfile.lock /usr/src/app/

RUN microdnf install --nodocs -y python39
RUN microdnf install --nodocs -y python39 pip
RUN pip3 install --upgrade pip && pip3 install micropipenv && micropipenv install

COPY . /usr/src/app/
Expand Down
6 changes: 3 additions & 3 deletions nginx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1179
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5-1739420147

# support running as an arbitrary user which belongs to the root group
RUN microdnf module enable nginx:1.22 && \
microdnf install -y nginx python3.11 python3.11-pip && \
RUN microdnf module enable -y nginx:1.22 && \
microdnf install -y nginx python3.11 pip && \
pip3 install --no-cache-dir jinja2 pyyaml && \
chmod g+rwx /var/log/nginx && \
rm -rf /var/lib/dnf /var/cache/dnf
Expand Down
2 changes: 1 addition & 1 deletion nginx/Dockerfile-prometheus
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1179
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5-1739420147

USER root

Expand Down