Merge pull request #23 from geniusdynamics/main

conform dev with Main
geniusdynamics · Jan 13, 2025 · 0147477 · 0147477
2 parents bf33d6f + 4c7fa8f
commit 0147477
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 12 deletions.
diff --git a/build-images.sh b/build-images.sh
@@ -15,7 +15,9 @@ repobase="${REPOBASE:-ghcr.io/geniusdynamics}"
 # Configure the image name
 reponame="erpnext"
 
-app_version="v15.35.0-ns.5"
+
+app_version="v15.48.2"
+
 
 # Create a new empty container image
 container=$(buildah from scratch)
@@ -47,7 +49,7 @@ buildah config --entrypoint=/ \
     --label="org.nethserver.authorizations=traefik@node:routeadm" \
     --label="org.nethserver.tcp-ports-demand=1" \
     --label="org.nethserver.rootfull=0" \
-    --label="org.nethserver.images=docker.io/mariadb:10.11.5 docker.io/geniusdynamics/custom-erpnext:${app_version} docker.io/redis:6.2-alpine" \
+    --label="org.nethserver.images=docker.io/mariadb:10.11.5 docker.io/geniusdynamics/erpnext:${app_version} docker.io/redis:6.2-alpine" \
     "${container}"
 # Commit the image
 buildah commit "${container}" "${repobase}/${reponame}"

diff --git a/imageroot/systemd/user/backend.service b/imageroot/systemd/user/backend.service
@@ -19,7 +19,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/backend.pid \
      --pod-id-file %t/erp-next.pod-id --replace -d --name backend \
     -v sites:/home/frappe/frappe-bench/sites \
     -v logs:/home/frappe/frappe-bench/logs \
-    ${CUSTOM_ERPNEXT_IMAGE}
+    ${ERPNEXT_IMAGE}
 
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/backend.ctr-id -t 10
 ExecReload=/usr/bin/podman kill -s HUP backend

diff --git a/imageroot/systemd/user/configurator.service b/imageroot/systemd/user/configurator.service
@@ -20,7 +20,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/configurator.pid \
     -v logs:/home/frappe/frappe-bench/logs \
     -v %S/bin/configurator:/configurator:Z \
     --env-file=%S/state/configurator.env \
-    ${CUSTOM_ERPNEXT_IMAGE} /bin/bash -c "/configurator"
+    ${ERPNEXT_IMAGE} /bin/bash -c "/configurator"
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/configurator.ctr-id -t 10
 ExecReload=/usr/bin/podman kill -s HUP configurator
 SyslogIdentifier=%u
@@ -29,4 +29,4 @@ PIDFile=%t/configurator.pid
 Type=forking
 
 [Install]
-WantedBy=default.target
+WantedBy=default.target
diff --git a/imageroot/systemd/user/create-site.service b/imageroot/systemd/user/create-site.service
@@ -16,7 +16,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/create-site.pid \
     -v %S/bin/create-site:/create-site:Z \
     --env-file=%S/state/database.env \
     --env-file=%S/state/erpnext-modules.env \
-     ${CUSTOM_ERPNEXT_IMAGE} /bin/bash -c "/create-site"
+     ${ERPNEXT_IMAGE} /bin/bash -c "/create-site"
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/create-site.ctr-id -t 10
 ExecReload=/usr/bin/podman kill -s HUP create-site
 SyslogIdentifier=%u
@@ -25,4 +25,4 @@ PIDFile=%t/create-site.pid
 Type=forking
 
 [Install]
-WantedBy=default.target
+WantedBy=default.target
diff --git a/imageroot/systemd/user/frontend.service b/imageroot/systemd/user/frontend.service
@@ -24,7 +24,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/frontend.pid \
     -e UPSTREAM_REAL_IP_RECURSIVE=off \
     -e PROXY_READ_TIMEOUT=120 \
     -e CLIENT_MAX_BODY_SIZE=50m \
-    ${CUSTOM_ERPNEXT_IMAGE} nginx-entrypoint.sh
+    ${ERPNEXT_IMAGE} nginx-entrypoint.sh
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/frontend.ctr-id -t 10
 ExecReload=/usr/bin/podman kill -s HUP frontend
 SyslogIdentifier=%u

diff --git a/imageroot/systemd/user/queue-long.service b/imageroot/systemd/user/queue-long.service
@@ -16,7 +16,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/queue-long.pid \
      --pod-id-file %t/erp-next.pod-id --replace -d --name queue-long \
     -v sites:/home/frappe/frappe-bench/sites \
     -v logs:/home/frappe/frappe-bench/logs \
-    ${CUSTOM_ERPNEXT_IMAGE} bench worker --queue long,default,short
+    ${ERPNEXT_IMAGE} bench worker --queue long,default,short
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/queue-long.ctr-id -t 10
 ExecReload=/usr/bin/podman kill -s HUP queue-long
 SyslogIdentifier=%u

diff --git a/imageroot/systemd/user/queue-short.service b/imageroot/systemd/user/queue-short.service
@@ -15,7 +15,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/queue-short.pid \
      --pod-id-file %t/erp-next.pod-id --replace -d --name queue-short \
     -v sites:/home/frappe/frappe-bench/sites \
     -v logs:/home/frappe/frappe-bench/logs \
-    ${CUSTOM_ERPNEXT_IMAGE} bench worker --queue short,default
+    ${ERPNEXT_IMAGE} bench worker --queue short,default
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/queue-short.ctr-id -t 10
 ExecReload=/usr/bin/podman kill -s HUP queue-short
 SyslogIdentifier=%u

diff --git a/imageroot/systemd/user/scheduler.service b/imageroot/systemd/user/scheduler.service
@@ -15,7 +15,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/scheduler.pid \
      --pod-id-file %t/erp-next.pod-id --replace -d --name scheduler \
     -v sites:/home/frappe/frappe-bench/sites \
     -v logs:/home/frappe/frappe-bench/logs \
-    ${CUSTOM_ERPNEXT_IMAGE} bench schedule
+    ${ERPNEXT_IMAGE} bench schedule
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/scheduler.ctr-id -t 10
 ExecReload=/usr/bin/podman kill -s HUP scheduler
 SyslogIdentifier=%u

diff --git a/imageroot/systemd/user/websocket.service b/imageroot/systemd/user/websocket.service
@@ -16,7 +16,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/websocket.pid \
      --pod-id-file %t/erp-next.pod-id --replace -d --name websocket \
     -v sites:/home/frappe/frappe-bench/sites \
     -v logs:/home/frappe/frappe-bench/logs \
-    ${CUSTOM_ERPNEXT_IMAGE} node /home/frappe/frappe-bench/apps/frappe/socketio.js
+    ${ERPNEXT_IMAGE} node /home/frappe/frappe-bench/apps/frappe/socketio.js
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/websocket.ctr-id -t 10
 ExecReload=/usr/bin/podman kill -s HUP websocket
 SyslogIdentifier=%u