Mercurial > sat_docs
comparison docker/sat_pubsub/Dockerfile @ 116:d0a5db5b9bdf
docker: fixed bad stopping:
- use exec when it was missing, so the TERM signal is properly catched, and containers can be stopped instead of being killed after 10s
- for a unknown reason, exec and su don't handle correctly "$@" with Docker in base.scripts/sat. It's working as expected when launched from withing a running container, but not when launched with "docker run", so a workaround is used with trap and wait
author | Goffi <goffi@goffi.org> |
---|---|
date | Fri, 04 Mar 2016 23:31:26 +0100 |
parents | b69056368901 |
children | d493fe1cf095 |
comparison
equal
deleted
inserted
replaced
115:5d8b9ca2afd4 | 116:d0a5db5b9bdf |
---|---|
13 ############################ | 13 ############################ |
14 # AUTOMATIC CONFIGURATION # | 14 # AUTOMATIC CONFIGURATION # |
15 ############################ | 15 ############################ |
16 | 16 |
17 | 17 |
18 COPY scripts/sat_pubsub /usr/local/bin/ | 18 COPY scripts/sat_pubsub scripts/launch_postgres_and_pubsub.sh /usr/local/bin/ |
19 RUN chown root:root /usr/local/bin/sat_pubsub && \ | 19 RUN chown root:root /usr/local/bin/sat_pubsub && \ |
20 chmod 0555 /usr/local/bin/sat_pubsub && \ | 20 chmod 0555 /usr/local/bin/sat_pubsub && \ |
21 chmod 0555 /usr/local/bin/launch_postgres_and_pubsub.sh && \ | |
21 | 22 |
22 ######## | 23 ######## |
23 # BASE # | 24 # BASE # |
24 ######## | 25 ######## |
25 | 26 |
47 ########## | 48 ########## |
48 # LAUNCH # | 49 # LAUNCH # |
49 ########## | 50 ########## |
50 | 51 |
51 # we need to launch PostgreSQL, so we launch as root then switch to sat user | 52 # we need to launch PostgreSQL, so we launch as root then switch to sat user |
52 ENTRYPOINT ["/bin/sh","-c", "service postgresql start && su -c sat_pubsub sat"] | 53 ENTRYPOINT ["launch_postgres_and_pubsub.sh"] |