Revert "Merge commit 'refs/pull/41/head' of https://github.com/bbernhard/signal-cli-rest-api"

This reverts commit 21764cefa4, reversing
changes made to 5c33d81817.
This commit is contained in:
Bernhard B
2020-12-25 11:05:09 +01:00
parent 21764cefa4
commit 5ef870fa0c
2 changed files with 4 additions and 23 deletions

View File

@@ -43,14 +43,11 @@ FROM adoptopenjdk:11-jdk-hotspot-bionic
COPY --from=buildcontainer /tmp/signal-cli-rest-api-src/signal-cli-rest-api /usr/bin/signal-cli-rest-api
COPY --from=buildcontainer /tmp/signal-cli /opt/signal-cli
COPY entrypoint.sh /entrypoint.sh
RUN groupadd -g 1000 signal-api \
&& useradd -M -d /home -s /bin/bash -u 1000 -g 1000 signal-api \
&& ln -s /opt/signal-cli/bin/signal-cli /usr/bin/signal-cli \
&& mkdir -p /signal-cli-config/ \
&& mkdir -p /home/.local/share/signal-cli
RUN ln -s /opt/signal-cli/bin/signal-cli /usr/bin/signal-cli
RUN mkdir -p /signal-cli-config/
RUN mkdir -p /home/.local/share/signal-cli
EXPOSE 8080
ENTRYPOINT ["/entrypoint.sh"]
ENTRYPOINT ["signal-cli-rest-api"]

View File

@@ -1,16 +0,0 @@
#!/bin/sh
set -x
set -e
# Fix permissions to ensure backward compatibility
chown 1000:1000 -R /home/.local/share/signal-cli
# Show warning on docker exec
cat <<EOF >> /root/.bashrc
echo "WARNING: signal-cli-rest-api runs as signal-api (not as root!)"
echo "Run 'su signal-api' before using signal-cli!"
EOF
# Start API as signal-api user
exec setpriv --reuid=1000 --regid=1000 --init-groups --inh-caps=-all signal-cli-rest-api $@