From 604d2d9b111528c79a3499c97e65d3d118d622fa Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Wed, 10 Nov 2021 17:39:11 -0600 Subject: [PATCH 1/2] Whitelist .egg-info directory to keep the copy of fidesops on the host machine from overriding it, so when we do "make server" we can find the fidesops package. --- Dockerfile | 4 ++-- docker-compose.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index cfb39750a..6f7c45e64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,8 @@ RUN pip install -r requirements.txt RUN pip install -r dev-requirements.txt # Copy in the application files and install it locally -COPY . /fidesops_install -WORKDIR /fidesops_install +COPY . /fidesops +WORKDIR /fidesops RUN pip install -e . WORKDIR /fidesops diff --git a/docker-compose.yml b/docker-compose.yml index ef69f8e04..4093fda1c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,6 +22,7 @@ services: source: ./ target: /fidesops read_only: False + - /fidesops/src/fidesops.egg-info db: image: postgres:12 From 87c582d35bc55eb7f2374c9058a86cb9337c3cdf Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Wed, 10 Nov 2021 17:47:36 -0600 Subject: [PATCH 2/2] Remove redundant setting of WORKDIR. --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6f7c45e64..f0d84caca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,4 @@ COPY . /fidesops WORKDIR /fidesops RUN pip install -e . -WORKDIR /fidesops - CMD [ "fidesops", "webserver" ] \ No newline at end of file