Commit 04265b21 authored by Ondřej Borýsek's avatar Ondřej Borýsek
Browse files

Switch to pwndoc-ng (customized version)

parent 26d6ca56
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -6,3 +6,8 @@
	path = pwndoc
	url = https://github.com/BorysekOndrej/pwndoc.git
	branch = customization-poc

[submodule "pwndoc-ng"]
	path = pwndoc-ng
	url = https://github.com/BorysekOndrej/pwndoc-ng.git
	branch = import-automator-stable
+11 −0
Original line number Diff line number Diff line
@@ -139,6 +139,17 @@ git pull --recurse-submodules -X ours

This will not be problem in future - from this release onward the Importer will save its temporary data into `debug_tmp\scan2report_data\`.


#### Version 2023-02-05

This version switches from [PwnDoc](https://github.com/pwndoc/pwndoc) (which is most likely no longer maintained) to [PwnDoc-ng](https://github.com/pwndoc-ng/pwndoc-ng) (a community fork).

The submodule `pwndoc` remains as an unused dependency, so that the update is guaranteed to be non-destructive and reversible if need be.

New submodule `pwndoc-ng` points to a [customized version of Pwndoc-ng](https://github.com/BorysekOndrej/pwndoc-ng/commits/import-automator-stable). In future when rebasing it beware that pwndoc-ng does not guarantee that master is buildable, but its releases should be.

No special update process is needed for this update, though you might encounter a merge conflict with `docker-compose.yml` if you've modified it.

## License

This project is licensed under MIT as are its dependencies PwnDoc and Scan2Report.
+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ services:


  pwndoc-backend:
    build: ./pwndoc/backend
    build: ./pwndoc-ng/backend
    container_name: pwndoc-backend
    volumes:
      - ./user_data/pwndoc-docx-templates:/app/report-templates
@@ -85,7 +85,7 @@ services:
    entrypoint: ["/bin/sh", "-c", "npm start 2>&1| tee -a /app/custom_logs/pwndoc.log"]

  pwndoc-frontend:
    build: ./pwndoc/frontend
    build: ./pwndoc-ng/frontend
    container_name: pwndoc-frontend
    restart: unless-stopped
    depends_on:
Original line number Diff line number Diff line
Subproject commit 17948f47e386edc3fc82b6101fcc17c80025f0bc