diff --git a/.dockerignore b/.dockerignore index eccdd0595..7e038d232 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,8 @@ +# Docker files +Dockerfile +.dockerignore +docker/ + # Ignore existing build artifacts build/ dist/ @@ -38,7 +43,17 @@ clients/ops/admin-ui/node_modules clients/ops/admin-ui/.next clients/privacy-center/.next .DS_Store +fidesops.toml +scripts/ +noxfile.py +noxfiles/ # Ignore cypress artifacts videos/ screenshots/ + +# Fidesops files not needed in docker +CHANGELOG.md +CODE_OF_CONDUCT.md +CONTRIBUTING.md +LICENSE diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ae07dd62..4c2d00eb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,8 @@ The types of changes are: ### Developer Experience * Created a docker image for the privacy center [#1165](https://github.com/ethyca/fidesops/pull/1165) -* Adds email scopes to postman collection [1241](https://github.com/ethyca/fidesops/pull/1241) +* Adds email scopes to postman collection [#1241](https://github.com/ethyca/fidesops/pull/1241) +* Clean up docker build [#1252](https://github.com/ethyca/fidesops/pull/1252) ### Added diff --git a/noxfiles/ci_nox.py b/noxfiles/ci_nox.py index ba5e02198..efe969d05 100644 --- a/noxfiles/ci_nox.py +++ b/noxfiles/ci_nox.py @@ -1,4 +1,7 @@ """Contains the nox sessions used during CI checks.""" + +from pathlib import Path + import nox from constants_nox import ( CI_ARGS, @@ -104,7 +107,15 @@ def xenon(session: nox.Session) -> None: @nox.session() def check_install(session: nox.Session) -> None: """Check that fidesops is installed in the container.""" - session.run("docker", "run", IMAGE_LOCAL, "fidesops", external=True) + session.run( + "docker", + "run", + "-v", + f"{Path().absolute()}:/fidesops", + IMAGE_LOCAL, + "fidesops", + external=True, + ) @nox.session() diff --git a/tests/ops/integration_tests/saas/test_shopify_task.py b/tests/ops/integration_tests/saas/test_shopify_task.py index 4d980498c..70a99034a 100644 --- a/tests/ops/integration_tests/saas/test_shopify_task.py +++ b/tests/ops/integration_tests/saas/test_shopify_task.py @@ -18,7 +18,8 @@ def test_shopify_connection_test(shopify_connection_config) -> None: @pytest.mark.integration_saas @pytest.mark.integration_shopify -def test_shopify_access_request_task( +@pytest.mark.asyncio +async def test_shopify_access_request_task( db, policy, shopify_connection_config, @@ -37,7 +38,7 @@ def test_shopify_access_request_task( merged_graph = shopify_dataset_config.get_graph() graph = DatasetGraph(merged_graph) - v = graph_task.run_access_request( + v = await graph_task.run_access_request( privacy_request, policy, graph,