Skip to content

remove stale lockfiles #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brichards64 merged 3 commits into from
Jan 31, 2025
Merged

remove stale lockfiles #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4731d81
move up backgroundSD startup in rc.local to before httpd
brichards64 Jan 30, 2025
3081907
remove stale lockfiles that prevent postgres re-start after docker st…
brichards64 Jan 31, 2025
0519b8f
run httpd in foreground. Pipe output from /etc/rc.local to /web/.rclo…
brichards64 Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions Dockerfile.server
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN cd /opt \
&& git clone https://github.com/ToolDAQ/middleman.git \
&& cd middleman/ \
&& git checkout v3.0 \
&& . Setup.sh \
&& . ./Setup.sh \
&& make

# docs build fails if index.html is not present, which kills the docker build
Expand All @@ -50,7 +50,7 @@ RUN sed -e 's/#LoadModule mpm_prefork_module/LoadModule mpm_prefork_module/' -i
&& sed -e '/LoadModule mpm_event_module/ s/^#*/#/' -i /etc/httpd/conf.modules.d/00-mpm.conf

RUN echo 'CP=$(type -t cp)' >> /etc/rc.local ;\
echo 'if [ ! -z "${CP}" ]; then unalias cp; fi' >> /etc/rc.local ;\
echo 'if [ ! -z "${CP}" ] && [ "${CP}" != "file" ]; then unalias cp; fi' >> /etc/rc.local ;\
echo "cp -f /web/httpd.conf /etc/httpd/conf/" >> /etc/rc.local ;\
echo "alias cp='cp -i'" >> /etc/rc.local ;\
echo "chmod a+x /web/SetupDatabase.sh" >> /etc/rc.local ;\
Expand All @@ -66,10 +66,11 @@ RUN echo 'CP=$(type -t cp)' >> /etc/rc.local ;\
echo 'disown $!' >> /etc/rc.local ;\
echo "/web/Trigger_proxy &> /dev/null &" >> /etc/rc.local ;\
echo 'disown $!' >> /etc/rc.local ;\
echo "httpd" >> /etc/rc.local ;\
echo "/web/backgroundSD &> /dev/null " >> /etc/rc.local ;\
echo "/web/backgroundSD &> /dev/null &" >> /etc/rc.local ;\
echo 'disown $!' >> /etc/rc.local ;\
echo "httpd -DFOREGROUND" >> /etc/rc.local ;\
chmod +x /etc/rc.local

#ENTRYPOINT ["/bin/bash"]
#CMD ["-c",". /etc/rc.local"]
CMD /bin/bash -c '. /etc/rc.local'
CMD /bin/bash -c '. /etc/rc.local 2>&1 | tee /web/.rclocal.log'
5 changes: 5 additions & 0 deletions SetupDatabase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ if [ -f /.DBSetupDone ]; then
# pg_ctl version for containers
STATUS=$(sudo -u postgres pg_ctl -D /var/lib/pgsql/data status &> /dev/null; echo $?)
if [ ${STATUS} -eq 3 ]; then
if [ -f /var/run/postgresql/.s.PGSQL.5432.lock ]; then
echo "removing stale lockfile"
sudo rm -f /var/run/postgresql/.s.PGSQL.5432.lock
fi
echo "running pg_ctl start"
sudo -u postgres /usr/bin/pg_ctl start -D /var/lib/pgsql/data -s -o "-p 5432" -w -t 300
fi
exit 0;
Expand Down