From 5ef870fa0ce5a753b920fce96a93f5c846bb7be0 Mon Sep 17 00:00:00 2001
From: Bernhard B <schluchti@gmail.com>
Date: Fri, 25 Dec 2020 11:05:09 +0100
Subject: [PATCH] Revert "Merge commit 'refs/pull/41/head' of
 https://github.com/bbernhard/signal-cli-rest-api"

This reverts commit 21764cefa4561cd96c1e148509e66aba5af458d6, reversing
changes made to 5c33d818179551634cb86751835506c57988d557.
---
 Dockerfile    | 11 ++++-------
 entrypoint.sh | 16 ----------------
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100755 entrypoint.sh

diff --git a/Dockerfile b/Dockerfile
index 196ca55..9940fae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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"]
diff --git a/entrypoint.sh b/entrypoint.sh
deleted file mode 100755
index 1439eb8..0000000
--- a/entrypoint.sh
+++ /dev/null
@@ -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 $@