Merge branch 'main' of github.com:rasos/frappe_docker

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",
@@ -29,9 +29,5 @@
     },
     {
         "url": "https://github.com/frappe/non_profit"
-    },
-    {
-        "url": "http://github.com/libracore/erpnextaustria",
-        "branch": "master"
     }
 ]

images/custom/apps_base64.json

@@ -1,14 +1 @@
-WwogICAgewogICAgICAgICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyYXBwZS9lcnBuZXh0
+WwogICAgewogICAgICAgICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyYXBwZS9lcnBuZXh0IiwKICAgICAgICAiYnJhbmNoIjogInZlcnNpb24tMTUiCiAgICB9LAogICAgewogICAgICAgICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyYXBwZS9wcmludF9kZXNpZ25lciIsCiAgICAgICAgImJyYW5jaCI6ICJtYWluIgogICAgfSwKICAgIHsKICAgICAgICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmFwcGUvcGF5bWVudHMiLAogICAgICAgICJicmFuY2giOiAidmVyc2lvbi0xNSIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL3dlYnNob3AiLAogICAgICAgICJicmFuY2giOiAidmVyc2lvbi0xNSIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL2Vjb21tZXJjZV9pbnRlZ3JhdGlvbnMiLAogICAgICAgICJicmFuY2giOiAibWFpbiIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL2hybXMiLAogICAgICAgICJicmFuY2giOiAidmVyc2lvbi0xNSIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL25vbl9wcm9maXQiCiAgICB9Cl0=
-IiwKICAgICAgICAiYnJhbmNoIjogInZlcnNpb24tMTUiCiAgICB9LAogICAgewogICAgICAgICJ1
-cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyYXBwZS9wcmludF9kZXNpZ25lciIsCiAgICAgICAg
-ImJyYW5jaCI6ICJkZXZlbG9wIgogICAgfSwKICAgIHsKICAgICAgICAidXJsIjogImh0dHBzOi8v
-Z2l0aHViLmNvbS9mcmFwcGUvcGF5bWVudHMiLAogICAgICAgICJicmFuY2giOiAidmVyc2lvbi0x
-NSIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBl
-L3dlYnNob3AiLAogICAgICAgICJicmFuY2giOiAidmVyc2lvbi0xNSIKICAgIH0sCiAgICB7CiAg
-ICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL2Vjb21tZXJjZV9pbnRlZ3Jh
-dGlvbnMiLAogICAgICAgICJicmFuY2giOiAibWFpbiIKICAgIH0sCiAgICB7CiAgICAgICAgInVy
-bCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJhcHBlL2hybXMiLAogICAgICAgICJicmFuY2giOiAi
-dmVyc2lvbi0xNSIKICAgIH0sCiAgICB7CiAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5j
-b20vZnJhcHBlL25vbl9wcm9maXQiCiAgICB9LAogICAgewogICAgICAgICJ1cmwiOiAiaHR0cDov
-L2dpdGh1Yi5jb20vbGlicmFjb3JlL2VycG5leHRhdXN0cmlhIiwKICAgICAgICAiYnJhbmNoIjog
-Im1hc3RlciIKICAgIH0KXQo=

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 \
@@ -106,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=main
 RUN bench init \
   --frappe-branch=${FRAPPE_BRANCH} \
   --frappe-path=${FRAPPE_PATH} \
@@ -116,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