Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-09-22 05:50:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add the obsidian link support to config also. Fix poll-for-db.

Browse source
This commit is contained in:
Jyri-Petteri Paloposki 2022-02-03 11:44:26 +02:00
parent 4c031c7699
commit 7a9dd6cd6f
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -13,7 +13,7 @@ RUN bundle install --jobs 4
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
RUN apt-get update && apt-get install -y yarn RUN apt-get update && apt-get install -y yarn netcat
RUN mkdir /app/log RUN mkdir /app/log

2
config/initializers/sanitizer.rb
View file

@ -7,4 +7,4 @@ safe_list =
Loofah::HTML5::WhiteList Loofah::HTML5::WhiteList
end end
safe_list::ALLOWED_PROTOCOLS.merge(%w(message onenote)) safe_list::ALLOWED_PROTOCOLS.merge(%w(message onenote obsidian))

4
script/poll-for-db
View file

@ -1,10 +1,12 @@
#!/bin/bash #!/bin/bash
echo "==> Polling DB…"
appdir=$(cd $(dirname "$0")/.. && pwd) appdir=$(cd $(dirname "$0")/.. && pwd)
[ -f /etc/app-env ] || exec "$appdir/script/docker-environment" $0 $@ [ -f /etc/app-env ] || exec "$appdir/script/docker-environment" $0 $@
for i in {1..60}; do for i in {1..60}; do
curl -sf telnet://db:3306 >/dev/null && exit nc -z -w5 db 3306 && exit
sleep 1 sleep 1
done done