Mercurial > sat_docs
diff 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 |
line wrap: on
line diff
--- a/docker/sat_pubsub/Dockerfile Fri Mar 04 23:25:42 2016 +0100 +++ b/docker/sat_pubsub/Dockerfile Fri Mar 04 23:31:26 2016 +0100 @@ -15,9 +15,10 @@ ############################ -COPY scripts/sat_pubsub /usr/local/bin/ +COPY scripts/sat_pubsub scripts/launch_postgres_and_pubsub.sh /usr/local/bin/ RUN chown root:root /usr/local/bin/sat_pubsub && \ chmod 0555 /usr/local/bin/sat_pubsub && \ +chmod 0555 /usr/local/bin/launch_postgres_and_pubsub.sh && \ ######## # BASE # @@ -49,4 +50,4 @@ ########## # we need to launch PostgreSQL, so we launch as root then switch to sat user -ENTRYPOINT ["/bin/sh","-c", "service postgresql start && su -c sat_pubsub sat"] +ENTRYPOINT ["launch_postgres_and_pubsub.sh"]