[Unified Fides] Bringing up Fides Shell after Code Changes

Bug Description

Bringing up the Fides shell fails when files have changed. I think I’ve mainly seen this happen when I had already run the shell with postgres, and I was changing to run the shell with a different database. I’ve seen this at least three times now.

Steps to Reproduce

nox -s dev -- shell postgres and then change some application files and then run nox -s dev -- shell timescale. (Reproduction steps may not be entirely accurate, I’m not positive that you have to change the database too.)

 => CACHED [backend  2/12] RUN apt-get update &&     apt-get install -y --no-install-recommends     git     make     vim     curl     g++     gnupg     gcc     python3-wheel     && apt-get clean     && rm -rf /var/lib/apt/lis  0.0s
 => CACHED [backend  3/12] COPY optional-requirements.txt .                                                                                                                                                                        0.0s
 => CACHED [backend  4/12] RUN pip install -U pip --no-cache-dir install -r optional-requirements.txt                                                                                                                              0.0s
 => CACHED [backend  5/12] COPY dev-requirements.txt .                                                                                                                                                                             0.0s
 => CACHED [backend  6/12] RUN pip install -U pip --no-cache-dir install -r dev-requirements.txt                                                                                                                                   0.0s
 => CACHED [backend  7/12] COPY requirements.txt .                                                                                                                                                                                 0.0s
 => CACHED [backend  8/12] RUN pip install -U pip --no-cache-dir install -r requirements.txt                                                                                                                                       0.0s
 => [backend  9/12] COPY . /fides                                                                                                                                                                                                  0.4s
 => [backend 10/12] WORKDIR /fides                                                                                                                                                                                                 0.0s
 => ERROR [backend 11/12] RUN git rm --cached -r .                                                                                                                                                                                 0.6s
------
 > [backend 11/12] RUN git rm --cached -r .:
#14 0.609 error: the following files have staged content different from both the
#14 0.609 file and the HEAD:
#14 0.609     tests/ops/integration_tests/test_execution.py
#14 0.609     tests/ops/integration_tests/test_sql_task.py
#14 0.609 (use -f to force removal)
------
executor failed running [/bin/sh -c git rm --cached -r .]: exit code: 1
nox > Command docker build --target=dev --tag ethyca/fides:local . failed with exit code 1
nox > Session dev failed.

Expected behavior

I can bring up a shell when files have changed or I’m changing which databases I want to bring up.

We might just be able to change the line to: RUN git rm --cached -rf .

Screenshots

If applicable, add screenshots to help explain your problem.

Environment

• Version:
• OS:
• Python Version:
• Docker Version:

Additional context

Add any other context about the problem here.

[pattisdr]

@ThomasLaPiana Yes, I’ve been able to confirm that this worked!

[ThomasLaPiana]

@pattisdr that makes sense, it is probably conflicting with the git cache reset command in the Dockerfile