From 9b5bd30f0d52ab605ad8e06bd2970cf7d61f06a8 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Tue, 25 Mar 2025 22:19:30 +0200
Subject: [PATCH] starts automatically the query-daemon in start-sed.sh
---
Dockerfile | 4 +++-
Makefile | 8 +++++---
start-sed.sh | 16 ++++++++++++++++
wsgi-scripts/query-server_d.py | 8 ++++----
4 files changed, 28 insertions(+), 8 deletions(-)
create mode 100755 start-sed.sh
diff --git a/Dockerfile b/Dockerfile
index a8e9195..95e4318 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,8 +6,10 @@ RUN dnf -y update &&\
mkdir -p /var/www/wsgi-scripts /srv/sed-data
COPY wsgi.conf /etc/httpd/conf.d/
COPY ./wsgi-scripts/*.py /var/www/wsgi-scripts/
+COPY ./start-sed.sh /root
EXPOSE 80
-ENTRYPOINT ["/usr/sbin/httpd","-DFOREGROUND"]
+CMD ["/root/start-sed.sh"]
+#ENTRYPOINT ["/usr/sbin/httpd","-DFOREGROUND"]
#ENTRYPOINT /bin/bash
diff --git a/Makefile b/Makefile
index fc71972..8a88687 100644
--- a/Makefile
+++ b/Makefile
@@ -25,11 +25,13 @@ run:
exec-bash:
docker exec -it sedmod-test bash
+# docker login git.ia2.inaf.it:5050 -u robert.butora
+# pwd szokasas regi: C*n
.PHONY: publish-localy
publish-localy:
- docker tag sedmods git.ia2.inaf.it:5050/vialactea/vlkb-sedmods/sedmods:0.1
- docker push git.ia2.inaf.it:5050/vialactea/vlkb-sedmods/sedmods:0.1
- docker image remove git.ia2.inaf.it:5050/vialactea/vlkb-sedmods/sedmods:0.1
+ docker tag sedmods git.ia2.inaf.it:5050/vialactea/vlkb-sedmods/sedmods:0.1.2
+ docker push git.ia2.inaf.it:5050/vialactea/vlkb-sedmods/sedmods:0.1.2
+ docker image remove git.ia2.inaf.it:5050/vialactea/vlkb-sedmods/sedmods:0.1.2
# with podman
diff --git a/start-sed.sh b/start-sed.sh
new file mode 100755
index 0000000..2ebcca6
--- /dev/null
+++ b/start-sed.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -eux
+
+{
+date
+env
+
+python3 -m Pyro4.naming &
+
+python3 /var/www/wsgi-scripts/query-server_d.py &
+
+date
+} 1> /tmp/start-sed.log 2>&1
+
+exec /usr/sbin/httpd -DFOREGROUND
diff --git a/wsgi-scripts/query-server_d.py b/wsgi-scripts/query-server_d.py
index 2b1e1bf..a3d94cd 100644
--- a/wsgi-scripts/query-server_d.py
+++ b/wsgi-scripts/query-server_d.py
@@ -29,10 +29,10 @@ root_logger.addHandler(handler)
-if socket.gethostname().find('.')>=0:
- hostname=socket.gethostname()
-else:
- hostname=socket.gethostbyaddr(socket.gethostname())[0] + ".local"
+#if socket.gethostname().find('.')>=0:
+hostname=socket.gethostname()
+#else:
+# hostname=socket.gethostbyaddr(socket.gethostname())[0] + ".local"
--
GitLab