Skip to content
This repository has been archived by the owner on Nov 30, 2022. It is now read-only.

Clean up docker build #1252

Merged
merged 9 commits into from
Sep 6, 2022
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# Docker files
Dockerfile
.dockerignore
docker/

# Ignore existing build artifacts
build/
dist/
Expand Down Expand Up @@ -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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ services:
- FIDESOPS__LOG_PII=${FIDESOPS__LOG_PII}
- FIDESOPS__HOT_RELOAD=${FIDESOPS__HOT_RELOAD}
- FIDESOPS__ROOT_USER__ANALYTICS_ID=${FIDESOPS__ROOT_USER__ANALYTICS_ID}
- FIDESOPS__EXECUTION__WORKER_ENABLED=True
sanders41 marked this conversation as resolved.
Show resolved Hide resolved

db:
image: postgres:12
Expand Down
13 changes: 12 additions & 1 deletion noxfiles/ci_nox.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
"""Contains the nox sessions used during CI checks."""

from pathlib import Path

import nox
from constants_nox import (
CI_ARGS,
Expand Down Expand Up @@ -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()
Expand Down
5 changes: 3 additions & 2 deletions tests/ops/integration_tests/saas/test_shopify_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down