From ff48f8d95810ebf0cce5d7cba4adfaa2b424b24b Mon Sep 17 00:00:00 2001 From: kemboi22 Date: Fri, 27 Dec 2024 23:36:34 +0300 Subject: [PATCH 1/7] feat: moved to erpnext v15.47.1 --- build-images.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-images.sh b/build-images.sh index eb089db..645b04f 100644 --- a/build-images.sh +++ b/build-images.sh @@ -15,7 +15,7 @@ repobase="${REPOBASE:-ghcr.io/geniusdynamics}" # Configure the image name reponame="erpnext" -app_version="v15.35.0-ns.5" +app_version="v15.47.0-ns.7" # Create a new empty container image container=$(buildah from scratch) From 9b0dc9335f9b080acbe71a90194603dade527917 Mon Sep 17 00:00:00 2001 From: kemboi22 Date: Fri, 27 Dec 2024 23:45:33 +0300 Subject: [PATCH 2/7] feat: moved to erpnext v15.47.1 --- build-images.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-images.sh b/build-images.sh index 645b04f..26c7529 100644 --- a/build-images.sh +++ b/build-images.sh @@ -15,7 +15,7 @@ repobase="${REPOBASE:-ghcr.io/geniusdynamics}" # Configure the image name reponame="erpnext" -app_version="v15.47.0-ns.7" +app_version="v15.47.1-ns.7" # Create a new empty container image container=$(buildah from scratch) From 5220ed476c60bf9579e1fe0b7cc37b56d1752c48 Mon Sep 17 00:00:00 2001 From: kemboi22 Date: Fri, 27 Dec 2024 23:54:58 +0300 Subject: [PATCH 3/7] feat: moved to erpnext v15.47.1 --- build-images.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-images.sh b/build-images.sh index 26c7529..c1f4753 100644 --- a/build-images.sh +++ b/build-images.sh @@ -47,7 +47,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}" From 5d75cfac542dc03be7ade6debbaf0b5daea52e95 Mon Sep 17 00:00:00 2001 From: kemboi22 Date: Sat, 28 Dec 2024 00:08:30 +0300 Subject: [PATCH 4/7] feat: renamed image names --- imageroot/systemd/user/backend.service | 2 +- imageroot/systemd/user/configurator.service | 4 ++-- imageroot/systemd/user/create-site.service | 4 ++-- imageroot/systemd/user/frontend.service | 2 +- imageroot/systemd/user/queue-long.service | 2 +- imageroot/systemd/user/queue-short.service | 2 +- imageroot/systemd/user/scheduler.service | 2 +- imageroot/systemd/user/websocket.service | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/imageroot/systemd/user/backend.service b/imageroot/systemd/user/backend.service index 43c1333..d01048e 100644 --- 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 index 4636dc4..098056d 100644 --- 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 \ No newline at end of file +WantedBy=default.target diff --git a/imageroot/systemd/user/create-site.service b/imageroot/systemd/user/create-site.service index 7a51712..6f335b0 100644 --- 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 \ No newline at end of file +WantedBy=default.target diff --git a/imageroot/systemd/user/frontend.service b/imageroot/systemd/user/frontend.service index 2fe5e2b..6bbf0d6 100644 --- 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 index ae6777c..2f091a7 100644 --- 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 index 6616372..ddb508a 100644 --- 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 index 0e017e6..1456cac 100644 --- 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 index bd1c887..f798203 100644 --- 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 From 04dab910cd6ca4623d46c3a32de92a7f0d3bc547 Mon Sep 17 00:00:00 2001 From: kemboi22 Date: Sat, 4 Jan 2025 09:02:15 +0300 Subject: [PATCH 5/7] deps: updated erpnext to version 15.47.4 --- build-images.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-images.sh b/build-images.sh index c1f4753..d7281e6 100644 --- a/build-images.sh +++ b/build-images.sh @@ -15,7 +15,7 @@ repobase="${REPOBASE:-ghcr.io/geniusdynamics}" # Configure the image name reponame="erpnext" -app_version="v15.47.1-ns.7" +app_version="v15.47.4" # Create a new empty container image container=$(buildah from scratch) From 4336c4a5f2ad388b3395b367aa6d045c470404b1 Mon Sep 17 00:00:00 2001 From: kemboi22 Date: Fri, 10 Jan 2025 06:14:17 +0300 Subject: [PATCH 6/7] feat: moved to version v15.48.1 --- build-images.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-images.sh b/build-images.sh index c1f4753..f36bfe7 100644 --- a/build-images.sh +++ b/build-images.sh @@ -15,7 +15,7 @@ repobase="${REPOBASE:-ghcr.io/geniusdynamics}" # Configure the image name reponame="erpnext" -app_version="v15.47.1-ns.7" +app_version="v15.48.1" # Create a new empty container image container=$(buildah from scratch) From 9919d82e4737057495614611c07c144504cb07c6 Mon Sep 17 00:00:00 2001 From: kemboi22 Date: Sun, 12 Jan 2025 23:48:34 +0300 Subject: [PATCH 7/7] deps: updated erpnext to version 15.48.2 --- build-images.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-images.sh b/build-images.sh index 66ee56f..4a2111e 100644 --- a/build-images.sh +++ b/build-images.sh @@ -16,7 +16,7 @@ repobase="${REPOBASE:-ghcr.io/geniusdynamics}" reponame="erpnext" -app_version="v15.48.1" +app_version="v15.48.2" # Create a new empty container image