File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -46,22 +46,24 @@ RUN luarocks remove --force luasocket 3.0rc1-2 \
4646
4747# create daemons
4848RUN mkdir /etc/service/redis-server \
49- && echo -n " #!/bin/sh\n exec redis-server /app/koreader-sync-server/config/redis.conf" > \
49+ && printf ' #!/bin/sh\n exec redis-server /app/koreader-sync-server/config/redis.conf\n ' > \
5050 /etc/service/redis-server/run \
5151 && chmod +x /etc/service/redis-server/run
5252
5353ENV ENABLE_USER_REGISTRATION=true
5454ENV GIN_ENV=production
5555
56+ # add app source code after so app changes don't invalidate dependency layers
57+ # but before starting the app
58+ COPY ./ koreader-sync-server
59+
5660# append 'daemon off;' at runtime so tests can still use the config normally
61+ # grep from start of line only; nginx.conf has daemon off commented out by default
5762RUN mkdir /etc/service/koreader-sync-server \
58- && echo -n "#!/bin/sh\n grep -q 'daemon off;' /app/koreader-sync-server/config/nginx.conf || echo 'daemon off;' >> /app/koreader-sync-server/config/nginx.conf\n cd /app/koreader-sync-server\n exec gin start" > \
63+ && printf "#!/bin/sh\n grep -q '^ daemon off;' /app/koreader-sync-server/config/nginx.conf || echo 'daemon off;' >> /app/koreader-sync-server/config/nginx.conf\n cd /app/koreader-sync-server\n exec gin start" > \
5964 /etc/service/koreader-sync-server/run \
6065 && chmod +x /etc/service/koreader-sync-server/run
6166
62- # add app source code last so app changes don't invalidate dependency layers
63- COPY ./ koreader-sync-server
64-
6567VOLUME ["/var/log/redis" , "/var/lib/redis" ]
6668
6769EXPOSE 7200
You can’t perform that action at this time.
0 commit comments