From a4df20056be9cbb0c55abe50cd92d38a509f0238 Mon Sep 17 00:00:00 2001 From: Priyadi Iman Nurcahyo Date: Tue, 17 Oct 2023 23:11:36 +0700 Subject: [PATCH 1/4] Add recipe for rekalogika/gotenberg-pdf-bundle --- .../packages/rekalogika_gotenberg_pdf.yaml | 2 ++ .../gotenberg-pdf-bundle/1.0/manifest.json | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 rekalogika/gotenberg-pdf-bundle/1.0/config/packages/rekalogika_gotenberg_pdf.yaml create mode 100644 rekalogika/gotenberg-pdf-bundle/1.0/manifest.json diff --git a/rekalogika/gotenberg-pdf-bundle/1.0/config/packages/rekalogika_gotenberg_pdf.yaml b/rekalogika/gotenberg-pdf-bundle/1.0/config/packages/rekalogika_gotenberg_pdf.yaml new file mode 100644 index 000000000..1af826025 --- /dev/null +++ b/rekalogika/gotenberg-pdf-bundle/1.0/config/packages/rekalogika_gotenberg_pdf.yaml @@ -0,0 +1,2 @@ +rekalogika_gotenberg_pdf: + url: 'http://%env(GOTENBERG_HOST)%:%env(GOTENBERG_PORT)%' \ No newline at end of file diff --git a/rekalogika/gotenberg-pdf-bundle/1.0/manifest.json b/rekalogika/gotenberg-pdf-bundle/1.0/manifest.json new file mode 100644 index 000000000..99b098b89 --- /dev/null +++ b/rekalogika/gotenberg-pdf-bundle/1.0/manifest.json @@ -0,0 +1,27 @@ +{ + "bundles": { + "Rekalogika\\GotenbergPdfBundle\\RekalogikaGotenbergPdfBundle": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + }, + "env": { + "GOTENBERG_HOST": "localhost", + "GOTENBERG_PORT": "3000" + }, + "docker-compose": { + "docker-compose.yml": { + "services": [ + "gotenberg:", + " image: docker.io/gotenberg/gotenberg:7" + ] + }, + "docker-compose.override.yml": { + "services": [ + "gotenberg:", + " ports:", + " - \"3000\"" + ] + } + } +} From e841bd3bfdd9af7c5e9883d512a9cf7bebc6f655 Mon Sep 17 00:00:00 2001 From: Priyadi Iman Nurcahyo Date: Tue, 17 Oct 2023 23:17:15 +0700 Subject: [PATCH 2/4] ends files with newlines --- .../1.0/config/packages/rekalogika_gotenberg_pdf.yaml | 2 +- rekalogika/gotenberg-pdf-bundle/1.0/manifest.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/rekalogika/gotenberg-pdf-bundle/1.0/config/packages/rekalogika_gotenberg_pdf.yaml b/rekalogika/gotenberg-pdf-bundle/1.0/config/packages/rekalogika_gotenberg_pdf.yaml index 1af826025..46becc475 100644 --- a/rekalogika/gotenberg-pdf-bundle/1.0/config/packages/rekalogika_gotenberg_pdf.yaml +++ b/rekalogika/gotenberg-pdf-bundle/1.0/config/packages/rekalogika_gotenberg_pdf.yaml @@ -1,2 +1,2 @@ rekalogika_gotenberg_pdf: - url: 'http://%env(GOTENBERG_HOST)%:%env(GOTENBERG_PORT)%' \ No newline at end of file + url: 'http://%env(GOTENBERG_HOST)%:%env(GOTENBERG_PORT)%' diff --git a/rekalogika/gotenberg-pdf-bundle/1.0/manifest.json b/rekalogika/gotenberg-pdf-bundle/1.0/manifest.json index 99b098b89..b33b6c82f 100644 --- a/rekalogika/gotenberg-pdf-bundle/1.0/manifest.json +++ b/rekalogika/gotenberg-pdf-bundle/1.0/manifest.json @@ -25,3 +25,4 @@ } } } + From 139bfffa21c0c432deafeb5ee2d374d4b786de31 Mon Sep 17 00:00:00 2001 From: Priyadi Iman Nurcahyo Date: Wed, 18 Oct 2023 01:15:26 +0700 Subject: [PATCH 3/4] use GOTENBERG_URL, but retain GOTENBERG_HOST and GOTENBERG_PORT --- .../1.0/config/packages/rekalogika_gotenberg_pdf.yaml | 2 +- rekalogika/gotenberg-pdf-bundle/1.0/manifest.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rekalogika/gotenberg-pdf-bundle/1.0/config/packages/rekalogika_gotenberg_pdf.yaml b/rekalogika/gotenberg-pdf-bundle/1.0/config/packages/rekalogika_gotenberg_pdf.yaml index 46becc475..ab1d54bff 100644 --- a/rekalogika/gotenberg-pdf-bundle/1.0/config/packages/rekalogika_gotenberg_pdf.yaml +++ b/rekalogika/gotenberg-pdf-bundle/1.0/config/packages/rekalogika_gotenberg_pdf.yaml @@ -1,2 +1,2 @@ rekalogika_gotenberg_pdf: - url: 'http://%env(GOTENBERG_HOST)%:%env(GOTENBERG_PORT)%' + url: '%env(GOTENBERG_URL)%' diff --git a/rekalogika/gotenberg-pdf-bundle/1.0/manifest.json b/rekalogika/gotenberg-pdf-bundle/1.0/manifest.json index b33b6c82f..5c0dc1426 100644 --- a/rekalogika/gotenberg-pdf-bundle/1.0/manifest.json +++ b/rekalogika/gotenberg-pdf-bundle/1.0/manifest.json @@ -7,7 +7,8 @@ }, "env": { "GOTENBERG_HOST": "localhost", - "GOTENBERG_PORT": "3000" + "GOTENBERG_PORT": "3000", + "GOTENBERG_URL": "http://${GOTENBERG_HOST}:${GOTENBERG_PORT}" }, "docker-compose": { "docker-compose.yml": { From 2ed3740594e100ca4eb02f9c5eaea38e3c9091d0 Mon Sep 17 00:00:00 2001 From: Priyadi Iman Nurcahyo Date: Wed, 18 Oct 2023 01:46:16 +0700 Subject: [PATCH 4/4] add env comment for clarity --- rekalogika/gotenberg-pdf-bundle/1.0/manifest.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rekalogika/gotenberg-pdf-bundle/1.0/manifest.json b/rekalogika/gotenberg-pdf-bundle/1.0/manifest.json index 5c0dc1426..f251f735d 100644 --- a/rekalogika/gotenberg-pdf-bundle/1.0/manifest.json +++ b/rekalogika/gotenberg-pdf-bundle/1.0/manifest.json @@ -6,6 +6,9 @@ "config/": "%CONFIG_DIR%/" }, "env": { + "#1": "The variables GOTENBERG_HOST & GOTENBERG_PORT are only used for Docker", + "#2": "integration. The library uses only GOTENBERG_URL. You can override", + "#3": "GOTENBERG_URL and safely ignore GOTENBERG_HOST & GOTENBERG_PORT.", "GOTENBERG_HOST": "localhost", "GOTENBERG_PORT": "3000", "GOTENBERG_URL": "http://${GOTENBERG_HOST}:${GOTENBERG_PORT}"