Skip to content

Commit

Permalink
chore: PROD-1697: Bump Debian base image and Python versions to lates…
Browse files Browse the repository at this point in the history
…t (fides) (#4630)
  • Loading branch information
daveqnet authored Mar 11, 2024
1 parent ef11403 commit 5eabf62
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/backend_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:

env:
IMAGE: ethyca/fides:local
DEFAULT_PYTHON_VERSION: "3.10.12"
DEFAULT_PYTHON_VERSION: "3.10.13"

jobs:
###############
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
strategy:
matrix:
# NOTE: These are the currently supported/tested Python Versions
python_version: ["3.8.17", "3.9.17", "3.10.12"]
python_version: ["3.8.18", "3.9.18", "3.10.13"]
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down Expand Up @@ -222,7 +222,7 @@ jobs:
needs: Check-Container-Startup
strategy:
matrix:
python_version: ["3.8.17", "3.9.17", "3.10.12"]
python_version: ["3.8.18", "3.9.18", "3.10.13"]
test_selection:
- "ctl-not-external"
- "ops-unit"
Expand Down Expand Up @@ -273,7 +273,7 @@ jobs:
strategy:
max-parallel: 1 # This prevents collisions in shared external resources
matrix:
python_version: ["3.8.17", "3.9.17", "3.10.12"]
python_version: ["3.8.18", "3.9.18", "3.10.13"]
runs-on: ubuntu-latest
timeout-minutes: 20
# In PRs run with the "unsafe" label, or run on a "push" event to main
Expand Down Expand Up @@ -313,7 +313,7 @@ jobs:
strategy:
max-parallel: 1 # This prevents collisions in shared external resources
matrix:
python_version: ["3.8.17", "3.9.17", "3.10.12"]
python_version: ["3.8.18", "3.9.18", "3.10.13"]
runs-on: ubuntu-latest
timeout-minutes: 20
# In PRs run with the "unsafe" label, or run on a "push" event to main
Expand Down Expand Up @@ -368,7 +368,7 @@ jobs:
strategy:
max-parallel: 1 # This prevents collisions in shared external resources
matrix:
python_version: ["3.8.17", "3.9.17", "3.10.12"]
python_version: ["3.8.18", "3.9.18", "3.10.13"]
steps:
- name: Download container
uses: actions/download-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cli_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
- "release-**"

env:
DEFAULT_PYTHON_VERSION: "3.10.12"
DEFAULT_PYTHON_VERSION: "3.10.13"

jobs:
# Basic smoke test of a local install of the fides Python CLI
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ The types of changes are:
### Changed
- Removed location and regulation beta flag [#4660](https://github.com/ethyca/fides/pull/4660)
- Modify `fides user login` to not store plaintext password in `~/.fides-credentials` [#4661](https://github.com/ethyca/fides/pull/4661)
- Bumped supported Python versions to `3.10.13`, `3.9.18`, and `3.8.18`. Bumped Debian base image from `-bullseye` to `-bookworm`. [#4630](https://github.com/ethyca/fides/pull/4630)

### Fixed
- Ignore 404 errors from Delighted and Kustomer when an erasure client is not found [#4593](https://github.com/ethyca/fides/pull/4593)
Expand All @@ -38,7 +39,6 @@ The types of changes are:
- Fix issue where "x" button on Fides.js components overwrites saved preferences [#4649](https://github.com/ethyca/fides/pull/4649)
- Initialize Fides.consent with default values from experience when saved consent cookie (fides_consent) does not exist [#4665](https://github.com/ethyca/fides/pull/4665)


## [2.30.1](https://github.com/ethyca/fides/compare/2.30.0...2.30.1)

### Fixed
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# If you update this, also update `DEFAULT_PYTHON_VERSION` in the GitHub workflow files
ARG PYTHON_VERSION="3.10.12"
ARG PYTHON_VERSION="3.10.13"
#########################
## Compile Python Deps ##
#########################
FROM python:${PYTHON_VERSION}-slim-bullseye as compile_image
FROM python:${PYTHON_VERSION}-slim-bookworm as compile_image


# Install auxiliary software
Expand All @@ -28,7 +28,7 @@ RUN apt-get update && \
unixodbc-dev \
freetds-dev \
freetds-bin \
python-dev \
python-dev-is-python3 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand All @@ -55,11 +55,11 @@ RUN pip install --no-cache-dir install -r dev-requirements.txt
##################
## Backend Base ##
##################
FROM python:${PYTHON_VERSION}-slim-bullseye as backend
FROM python:${PYTHON_VERSION}-slim-bookworm as backend

# Add the fidesuser user but don't switch to it yet
RUN addgroup --system --gid 1001 fidesgroup
RUN adduser --system --uid 1001 fidesuser
RUN adduser --system --uid 1001 --home /home/fidesuser fidesuser


RUN apt-get update && \
Expand All @@ -68,7 +68,7 @@ RUN apt-get update && \
git \
freetds-dev \
freetds-bin \
python-dev \
python-dev-is-python3 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down
6 changes: 3 additions & 3 deletions docs/fides/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10.12-slim-bullseye as build
FROM python:3.10.13-slim-bookworm as build

RUN apt-get update && \
apt-get install -y --no-install-recommends \
Expand All @@ -20,7 +20,7 @@ RUN apt-get update && \
unixodbc-dev \
freetds-dev \
freetds-bin \
python-dev \
python-dev-is-python3 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand All @@ -31,7 +31,7 @@ COPY . .
RUN pip install -U pip && pip install . && pip install -r docs/fides/requirements.txt


FROM python:3.10.12-slim-bullseye as docs
FROM python:3.10.13-slim-bookworm as docs
RUN apt-get update && \
apt-get install -y --no-install-recommends \
git \
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ redis==3.5.3
rich-click==1.6.1
sendgrid==6.9.7
slowapi==0.1.8
snowflake-sqlalchemy==1.4.3
snowflake-sqlalchemy==1.5.1
sqlalchemy[asyncio]==1.4.27
sqlalchemy-citext==1.8.0
sqlalchemy-bigquery==1.7.0
Expand Down

0 comments on commit 5eabf62

Please sign in to comment.