From aad37830794ce4034d8c8e8a8191e75b38c408c7 Mon Sep 17 00:00:00 2001 From: Rdataflow Date: Tue, 23 Jan 2024 09:53:27 +0100 Subject: [PATCH 1/2] fix: update docker-compose to work with current config --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ca2b63935..1521a425c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: "3" services: ## Running in Docker slows down development a lot, so this is only kept for reference here. # nextjs: - # image: "node:12" + # image: "node:18" # ports: # - "3000:3000" # volumes: @@ -13,7 +13,7 @@ services: # depends_on: # - db # environment: - # DATABASE_URL: "postgres://postgres@db:5432/template1" + # DATABASE_URL: "postgres://postgres:password@db:5432/template1" # restart: "always" db: image: "postgres:11" From b8c65d3abee2c53a0ca5a6428b72b8fbc7e3c09c Mon Sep 17 00:00:00 2001 From: Rdataflow Date: Tue, 23 Jan 2024 10:03:41 +0100 Subject: [PATCH 2/2] feat: add SPARQL inspection --- docker-compose.mitm.yml | 60 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 docker-compose.mitm.yml diff --git a/docker-compose.mitm.yml b/docker-compose.mitm.yml new file mode 100644 index 000000000..4044b0081 --- /dev/null +++ b/docker-compose.mitm.yml @@ -0,0 +1,60 @@ +# Only used for dev atm! +version: "3" +services: + ## Running in Docker slows down development a lot, so this is only kept for reference here. + # nextjs: + # image: "node:18" + # ports: + # - "3000:3000" + # volumes: + # - "./:/usr/src/app:delegated" + # - "mitmproxy-config:/mitmproxy/" + # working_dir: "/usr/src/app" + # command: ["sh", "-c", "yarn && yarn dev:mitmproxy"] + # depends_on: + # - db + # environment: + # DATABASE_URL: "postgres://postgres:password@db:5432/template1" + # HTTP_PROXY: "http://mitmweb:8080" + # NODE_EXTRA_CA_CERTS: "/mitmproxy/mitmproxy-ca-cert.pem" + # NO_PROXY: "localhost,127.0.0.1" + # restart: "always" + + visualize: + image: "ghcr.io/visualize-admin/visualization-tool/visualization-tool:release" + ports: + - "3000:3000" + volumes: + - "mitmproxy-config:/mitmproxy/" + working_dir: "/usr/src/app" + depends_on: + - db + - mitmweb + environment: + DATABASE_URL: "postgres://postgres:password@db:5432/template1" + HTTP_PROXY: "http://mitmweb:8080" + NODE_EXTRA_CA_CERTS: "/mitmproxy/mitmproxy-ca-cert.pem" + NO_PROXY: "localhost,127.0.0.1" + restart: "always" + + db: + image: "postgres:11" + ports: + - "5432:5432" + environment: + POSTGRES_DB: "visualization_tool" + POSTGRES_PASSWORD: "password" + + mitmweb: + image: "mitmproxy/mitmproxy:latest" + ports: + - 8080:8080 + - 8081:8081 + volumes: + - "mitmproxy-config:/root/.mitmproxy/" + user: root:root + command: ["sh", "-c", "cd && pwd && whoami && mitmweb --web-host 0.0.0.0 --no-web-open-browser"] + + +volumes: + mitmproxy-config: