Mercurial > libervia-backend
changeset 3694:a6811543c7ff
docker (prosody): remove unused `entrypoint.sh` file and `sed` from Dockerfile:
The `sed` is not necessary anymore in recent Docker images, since
https://github.com/prosody/prosody-docker/pull/65 has been merged.
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Fri, 22 Oct 2021 10:39:05 +0200 |
| parents | 0bbdc50aa405 |
| children | 87caf6284c55 |
| files | docker/prosody-e2e/Dockerfile docker/prosody-e2e/entrypoint.sh |
| diffstat | 2 files changed, 0 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/docker/prosody-e2e/Dockerfile Thu Oct 21 11:55:39 2021 +0200 +++ b/docker/prosody-e2e/Dockerfile Fri Oct 22 10:39:05 2021 +0200 @@ -16,7 +16,3 @@ COPY --chown=root:tls-cert certificates/server1.test/cert.pem /usr/share/libervia/certificates/server1.test.pem COPY --chown=root:tls-cert certificates/server1.test/key.pem /usr/share/libervia/certificates/server1.test-key.pem -# we add exec to handle properly signals, this is missing upstream -# FIXME: to be removed when new images are generated with -# https://github.com/prosody/prosody-docker/pull/65 -RUN sed -i "s/^runuser -u prosody/exec \0/" /entrypoint.sh
--- a/docker/prosody-e2e/entrypoint.sh Thu Oct 21 11:55:39 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -#!/bin/bash -set -e - -usermod -u "$(stat -c %u /var/lib/prosody/.)" prosody - -if [[ "$1" != "prosody" ]]; then - exec prosodyctl "$@" - exit 0; -fi - -if [ "$LOCAL" -a "$PASSWORD" -a "$DOMAIN" ] ; then - prosodyctl register "$LOCAL" "$DOMAIN" "$PASSWORD" -fi - -exec runuser -u prosody -- "$@"