diff --git a/Dockerfile b/Dockerfile index a8e91955fe047a78c42a8d15ef0d1e91bd1cfe6b..95e4318dededac2c0aa4ed398a78377073b2baad 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 fc71972c6864b947d169e5729ffbd4f9c521edb1..8a886879a617b6c76edeaf97aa26d33721250966 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 0000000000000000000000000000000000000000..2ebcca63a02f0c48e8d09649576fd884e413fefc --- /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 2b1e1bf103e79e98c196e38802cd935221247417..a3d94cd1d5602257072f88879007e545eab37c79 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"