From c9ca2e45b4d62b6bbea03f3018f5720f52df9d4f Mon Sep 17 00:00:00 2001 From: Roland Date: Sat, 31 May 2025 13:42:31 +0200 Subject: [PATCH 1/7] sample custom apps.json, erpnextaustria app removed --- images/custom/apps.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/images/custom/apps.json b/images/custom/apps.json index d6182d36..c0c78383 100644 --- a/images/custom/apps.json +++ b/images/custom/apps.json @@ -25,9 +25,5 @@ }, { "url": "https://github.com/frappe/non_profit" - }, - { - "url": "http://github.com/libracore/erpnextaustria", - "branch": "master" } ] From 375caef3c4a33dd5bd3c12acaee165c47158cbdd Mon Sep 17 00:00:00 2001 From: Roland Date: Sat, 31 May 2025 13:43:39 +0200 Subject: [PATCH 2/7] Update apps_base64.json --- images/custom/apps_base64.json | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/images/custom/apps_base64.json b/images/custom/apps_base64.json index 099e29d4..e7092562 100644 --- a/images/custom/apps_base64.json +++ b/images/custom/apps_base64.json @@ -1,14 +1 @@ -WwogICAgewogICAgICAgICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyYXBwZS9lcnBuZXh0 -IiwKICAgICAgICAiYnJhbmNoIjogInZlcnNpb24tMTUiCiAgICB9LAogICAgewogICAgICAgICJ1 -cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyYXBwZS9wcmludF9kZXNpZ25lciIsCiAgICAgICAg -ImJyYW5jaCI6ICJkZXZlbG9wIgogICAgfSwKICAgIHsKICAgICAgICAidXJsIjogImh0dHBzOi8v -Z2l0aHViLmNvbS9mcmFwcGUvcGF5bWVudHMiLAogICAgICAgICJicmFuY2giOiAidmVyc2lvbi0x -NSIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBl -L3dlYnNob3AiLAogICAgICAgICJicmFuY2giOiAidmVyc2lvbi0xNSIKICAgIH0sCiAgICB7CiAg -ICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL2Vjb21tZXJjZV9pbnRlZ3Jh -dGlvbnMiLAogICAgICAgICJicmFuY2giOiAibWFpbiIKICAgIH0sCiAgICB7CiAgICAgICAgInVy -bCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL2hybXMiLAogICAgICAgICJicmFuY2giOiAi -dmVyc2lvbi0xNSIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5j -b20vZnJhcHBlL25vbl9wcm9maXQiCiAgICB9LAogICAgewogICAgICAgICJ1cmwiOiAiaHR0cDov -L2dpdGh1Yi5jb20vbGlicmFjb3JlL2VycG5leHRhdXN0cmlhIiwKICAgICAgICAiYnJhbmNoIjog -Im1hc3RlciIKICAgIH0KXQo= +WwogICAgewogICAgICAgICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyYXBwZS9lcnBuZXh0IiwKICAgICAgICAiYnJhbmNoIjogInZlcnNpb24tMTUiCiAgICB9LAogICAgewogICAgICAgICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyYXBwZS9wcmludF9kZXNpZ25lciIsCiAgICAgICAgImJyYW5jaCI6ICJkZXZlbG9wIgogICAgfSwKICAgIHsKICAgICAgICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmFwcGUvcGF5bWVudHMiLAogICAgICAgICJicmFuY2giOiAidmVyc2lvbi0xNSIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL3dlYnNob3AiLAogICAgICAgICJicmFuY2giOiAidmVyc2lvbi0xNSIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL2Vjb21tZXJjZV9pbnRlZ3JhdGlvbnMiLAogICAgICAgICJicmFuY2giOiAibWFpbiIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL2hybXMiLAogICAgICAgICJicmFuY2giOiAidmVyc2lvbi0xNSIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL25vbl9wcm9maXQiCiAgICB9Cl0= From f1b5c7b33af6c747eb81dcc8b0b1b6aeb2c05198 Mon Sep 17 00:00:00 2001 From: Roland Date: Sat, 31 May 2025 13:47:45 +0200 Subject: [PATCH 3/7] Update Containerfile with Chromium dependencies --- images/production/Containerfile | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/images/production/Containerfile b/images/production/Containerfile index ee2de66a..956de181 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -35,6 +35,39 @@ RUN useradd -ms /bin/bash frappe \ wait-for-it \ jq \ pdftk \ + # for Chrome PDF builder with print_designer app: + fonts-liberation \ + libatk-bridge2.0-0 \ + libatk1.0-0 \ + libatspi2.0-0 \ + libgbm1 \ + libgtk-4-1 \ + libnspr4 \ + libnss3 \ + xdg-utils \ + libvulkan1 \ + libxcomposite1 \ + libxdamage1 \ + libxfixes3 \ + libxkbcommon0 \ + libxrandr2 \ + libasound2 \ + chromium \ + # and we may also need this for printing + ca-certificates \ + libc6 \ + libcairo2 \ + libcups2 \ + libdbus-1-3 \ + libexpat1 \ + libglib2.0-0 \ + libpango-1.0-0 \ + wget \ + libudev1 \ + libx11-6 \ + libxcb1 \ + libxext6 \ + libcurl3-gnutls \ # NodeJS && mkdir -p ${NVM_DIR} \ && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash \ From 1cd5f57ab11bfe2e52f60d44562775f8428f4cfc Mon Sep 17 00:00:00 2001 From: Roland Date: Sat, 31 May 2025 13:57:25 +0200 Subject: [PATCH 4/7] get print_designer with bench --- images/production/Containerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/production/Containerfile b/images/production/Containerfile index 956de181..76622640 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -139,6 +139,8 @@ ARG FRAPPE_BRANCH=version-15 ARG FRAPPE_PATH=https://github.com/frappe/frappe ARG ERPNEXT_REPO=https://github.com/frappe/erpnext ARG ERPNEXT_BRANCH=version-15 +ARG PRINTDESIGNER_REPO=https://github.com/frappe/print_designer +ARG PRINTDESIGNER_BRANCH=develop RUN bench init \ --frappe-branch=${FRAPPE_BRANCH} \ --frappe-path=${FRAPPE_PATH} \ @@ -149,6 +151,7 @@ RUN bench init \ /home/frappe/frappe-bench && \ cd /home/frappe/frappe-bench && \ bench get-app --branch=${ERPNEXT_BRANCH} --resolve-deps erpnext ${ERPNEXT_REPO} && \ + bench get-app --branch=${PRINTDESIGNER_BRANCH} ${PRINTDESIGNER_REPO} && \ echo "{}" > sites/common_site_config.json && \ find apps -mindepth 1 -path "*/.git" | xargs rm -fr From bfee5a397a0fe4dcafca3e28cd69f58f0174e7c3 Mon Sep 17 00:00:00 2001 From: Roland Date: Sun, 1 Jun 2025 10:11:22 +0200 Subject: [PATCH 5/7] use print_designer branch main --- images/production/Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/production/Containerfile b/images/production/Containerfile index 76622640..666bd1c9 100644 --- a/images/production/Containerfile +++ b/images/production/Containerfile @@ -140,7 +140,7 @@ ARG FRAPPE_PATH=https://github.com/frappe/frappe ARG ERPNEXT_REPO=https://github.com/frappe/erpnext ARG ERPNEXT_BRANCH=version-15 ARG PRINTDESIGNER_REPO=https://github.com/frappe/print_designer -ARG PRINTDESIGNER_BRANCH=develop +ARG PRINTDESIGNER_BRANCH=main RUN bench init \ --frappe-branch=${FRAPPE_BRANCH} \ --frappe-path=${FRAPPE_PATH} \ From 01cfdcf3af33c95812bdf649811dd184461cb5c2 Mon Sep 17 00:00:00 2001 From: Roland Date: Sun, 1 Jun 2025 10:12:21 +0200 Subject: [PATCH 6/7] use print_designer branch main in custom image --- images/custom/apps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/custom/apps.json b/images/custom/apps.json index c0c78383..7ad01e60 100644 --- a/images/custom/apps.json +++ b/images/custom/apps.json @@ -5,7 +5,7 @@ }, { "url": "https://github.com/frappe/print_designer", - "branch": "develop" + "branch": "main" }, { "url": "https://github.com/frappe/payments", From 9785f9867a9dc106d156cb58fa6d44135cb4ea5d Mon Sep 17 00:00:00 2001 From: Roland Date: Sun, 1 Jun 2025 10:14:24 +0200 Subject: [PATCH 7/7] use print_designer branch main in custom image base64 --- images/custom/apps_base64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/custom/apps_base64.json b/images/custom/apps_base64.json index e7092562..acac377a 100644 --- a/images/custom/apps_base64.json +++ b/images/custom/apps_base64.json @@ -1 +1 @@ -WwogICAgewogICAgICAgICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyYXBwZS9lcnBuZXh0IiwKICAgICAgICAiYnJhbmNoIjogInZlcnNpb24tMTUiCiAgICB9LAogICAgewogICAgICAgICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyYXBwZS9wcmludF9kZXNpZ25lciIsCiAgICAgICAgImJyYW5jaCI6ICJkZXZlbG9wIgogICAgfSwKICAgIHsKICAgICAgICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmFwcGUvcGF5bWVudHMiLAogICAgICAgICJicmFuY2giOiAidmVyc2lvbi0xNSIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL3dlYnNob3AiLAogICAgICAgICJicmFuY2giOiAidmVyc2lvbi0xNSIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL2Vjb21tZXJjZV9pbnRlZ3JhdGlvbnMiLAogICAgICAgICJicmFuY2giOiAibWFpbiIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL2hybXMiLAogICAgICAgICJicmFuY2giOiAidmVyc2lvbi0xNSIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL25vbl9wcm9maXQiCiAgICB9Cl0= +WwogICAgewogICAgICAgICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyYXBwZS9lcnBuZXh0IiwKICAgICAgICAiYnJhbmNoIjogInZlcnNpb24tMTUiCiAgICB9LAogICAgewogICAgICAgICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyYXBwZS9wcmludF9kZXNpZ25lciIsCiAgICAgICAgImJyYW5jaCI6ICJtYWluIgogICAgfSwKICAgIHsKICAgICAgICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmFwcGUvcGF5bWVudHMiLAogICAgICAgICJicmFuY2giOiAidmVyc2lvbi0xNSIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL3dlYnNob3AiLAogICAgICAgICJicmFuY2giOiAidmVyc2lvbi0xNSIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL2Vjb21tZXJjZV9pbnRlZ3JhdGlvbnMiLAogICAgICAgICJicmFuY2giOiAibWFpbiIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL2hybXMiLAogICAgICAgICJicmFuY2giOiAidmVyc2lvbi0xNSIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL25vbl9wcm9maXQiCiAgICB9Cl0=