Skip to content

Commit fc2558a

Browse files
authored
Fix Dockerfile for containerized Gin startup (#41)
Fix #39.
1 parent 24a8596 commit fc2558a

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

Dockerfile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,24 @@ RUN luarocks remove --force luasocket 3.0rc1-2 \
4646

4747
# create daemons
4848
RUN mkdir /etc/service/redis-server \
49-
&& echo -n "#!/bin/sh\nexec redis-server /app/koreader-sync-server/config/redis.conf" > \
49+
&& printf '#!/bin/sh\nexec 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

5353
ENV ENABLE_USER_REGISTRATION=true
5454
ENV 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
5762
RUN mkdir /etc/service/koreader-sync-server \
58-
&& echo -n "#!/bin/sh\ngrep -q 'daemon off;' /app/koreader-sync-server/config/nginx.conf || echo 'daemon off;' >> /app/koreader-sync-server/config/nginx.conf\ncd /app/koreader-sync-server\nexec gin start" > \
63+
&& printf "#!/bin/sh\ngrep -q '^daemon off;' /app/koreader-sync-server/config/nginx.conf || echo 'daemon off;' >> /app/koreader-sync-server/config/nginx.conf\ncd /app/koreader-sync-server\nexec 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-
6567
VOLUME ["/var/log/redis", "/var/lib/redis"]
6668

6769
EXPOSE 7200

0 commit comments

Comments
 (0)