Commit 9b5bd30f authored by Robert Butora's avatar Robert Butora
Browse files

starts automatically the query-daemon in start-sed.sh

parent 232faf66

Dockerfile

+3 −1
Original line number Diff line number Diff line
@@ -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

Makefile

+5 −3
Original line number Diff line number Diff line
@@ -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

start-sed.sh

0 → 100755
+16 −0
Original line number Diff line number Diff line 
#!/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

wsgi-scripts/query-server_d.py

+4 −4
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ root_logger.addHandler(handler) 






if socket.gethostname().find('.')>=0:

#if socket.gethostname().find('.')>=0:

hostname=socket.gethostname()

else:

    hostname=socket.gethostbyaddr(socket.gethostname())[0] + ".local"

#else:

#    hostname=socket.gethostbyaddr(socket.gethostname())[0] + ".local"