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.

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

[CCXDEV-13108] Setuptools update #258

Merged
merged 1 commit into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 8 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Stage 1: Base
# Stage 1: Base and Build
FROM registry.access.redhat.com/ubi9-minimal:latest AS base

ENV VENV=/ccx-messaging-venv \
Expand All @@ -12,27 +12,23 @@ RUN curl -ksL https://certs.corp.redhat.com/certs/2015-IT-Root-CA.pem -o /etc/pk
curl -ksL https://certs.corp.redhat.com/certs/2022-IT-Root-CA.pem -o /etc/pki/ca-trust/source/anchors/2022-IT-Root-CA.pem && \
update-ca-trust

RUN microdnf install --nodocs -y python3.11 unzip tar git-core && \
python3.11 -m venv $VENV && \
pip install --no-cache-dir -U pip

# Stage 2: Builder
FROM base AS builder

COPY . $HOME

RUN pip install --no-cache-dir -r requirements.txt && \
RUN microdnf install --nodocs -y python3.11 unzip tar git-core && \
python3.11 -m venv $VENV && \
pip install --no-cache-dir -U pip && \
pip install --no-cache-dir -r requirements.txt && \
pip install --no-cache-dir .

# Stage 3: Final

# Stage 2: Final
FROM base AS final

RUN microdnf remove -y git-core && \
microdnf clean all && \
rpm -e --nodeps sqlite-libs krb5-libs libxml2 readline pam openssh openssh-clients

COPY --from=builder $VENV $VENV
COPY --from=builder $HOME $HOME


RUN chmod -R g=u $HOME $VENV /etc/passwd && \
chgrp -R 0 $HOME $VENV
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools>=64", "setuptools_scm>=8"]
requires = ["setuptools>=70", "setuptools_scm>=8"]
build-backend = "setuptools.build_meta"

[project]
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ PyYAML>=6.0
requests>=2.31.0
sentry-sdk>=1.37.1
watchtower>=3.0.0

setuptools>=70.0.0
aiobotocore==2.14.0
s3fs==2024.6.1
Loading