-
Notifications
You must be signed in to change notification settings - Fork 92
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into unpause_csi_volume_handle
- Loading branch information
Showing
16 changed files
with
966 additions
and
847 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,7 +20,7 @@ jobs: | |
- name: Install Python | ||
uses: actions/[email protected] | ||
with: | ||
python-version: '3.9' | ||
python-version: '3.11' | ||
|
||
- name: Run pre-commit checks | ||
uses: pre-commit/[email protected] | ||
|
@@ -153,7 +153,7 @@ jobs: | |
max-parallel: 4 | ||
matrix: | ||
python-version: | ||
- '3.9' | ||
- '3.11' | ||
env: | ||
COMPOSE_FILE: .github/postgres/docker-compose.yaml | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest AS base | |
|
||
USER root | ||
|
||
ENV PYTHON_VERSION=3.9 \ | ||
ENV PYTHON_VERSION=3.11 \ | ||
PYTHONUNBUFFERED=1 \ | ||
PYTHONIOENCODING=UTF-8 \ | ||
LC_ALL=en_US.UTF-8 \ | ||
|
@@ -24,8 +24,8 @@ LABEL summary="$SUMMARY" \ | |
io.k8s.description="$DESCRIPTION" \ | ||
io.k8s.display-name="Koku" \ | ||
io.openshift.expose-services="8000:http" \ | ||
io.openshift.tags="builder,python,python39,rh-python39" \ | ||
com.redhat.component="python39-docker" \ | ||
io.openshift.tags="builder,python,python3.11,rh-python3.11" \ | ||
com.redhat.component="python3.11-docker" \ | ||
name="Koku" \ | ||
version="1" \ | ||
maintainer="Red Hat Cost Management Services <[email protected]>" | ||
|
@@ -35,7 +35,7 @@ LABEL summary="$SUMMARY" \ | |
# gcc to compile some python packages (e.g. ciso8601) | ||
# shadow-utils to make useradd available | ||
# libpq-devel needed for building psycopg2 | ||
RUN INSTALL_PKGS="python39 python39-devel glibc-langpack-en gcc shadow-utils libpq-devel" && \ | ||
RUN INSTALL_PKGS="python3.11 python3.11-devel glibc-langpack-en gcc-c++ shadow-utils libpq-devel" && \ | ||
microdnf --nodocs -y upgrade && \ | ||
microdnf reinstall tzdata && \ | ||
microdnf -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \ | ||
|
@@ -72,7 +72,7 @@ ARG USER_ID=1000 | |
# Create a Python virtual environment for use by any application to avoid | ||
# potential conflicts with Python packages preinstalled in the main Python | ||
# installation. | ||
RUN python3.9 -m venv /pipenv-venv \ | ||
RUN python3.11 -m venv /pipenv-venv \ | ||
&& /pipenv-venv/bin/python -m pip install --upgrade pip setuptools \ | ||
&& /pipenv-venv/bin/python -m pip install pipenv | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.