aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Sokolic <oofnik@gmail.com>2020-10-11 09:25:34 +0300
committerJordan Sokolic <oofnik@gmail.com>2020-10-11 09:25:34 +0300
commit60de9d5caa39cbd3abc62b3f8954a36c895e60a9 (patch)
tree1f68f8ab2dbce48ebd90e66d7f9ed62140dc7492
parent2995606f4d376535f20508fd36b9d09227117577 (diff)
use tini init
-rw-r--r--Dockerfile7
-rwxr-xr-xdocker-entrypoint.sh4
2 files changed, 4 insertions, 7 deletions
diff --git a/Dockerfile b/Dockerfile
index ffbb47b..fd3af68 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,8 @@ RUN apk update && apk add \
autoconf \
automake \
make \
- gcc
+ gcc \
+ tini
COPY . /build
WORKDIR /build
RUN autoreconf -fi && ./configure && make
@@ -12,5 +13,5 @@ RUN make DESTDIR=/opt install
FROM alpine
COPY --from=build /opt /
-COPY docker-entrypoint.sh /
-ENTRYPOINT ["/docker-entrypoint.sh"] \ No newline at end of file
+COPY --from=build /sbin/tini /sbin/tini
+ENTRYPOINT ["/sbin/tini", "/usr/local/bin/ptunnel-ng"] \ No newline at end of file
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
deleted file mode 100755
index 99862eb..0000000
--- a/docker-entrypoint.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -e
-/usr/local/bin/ptunnel-ng "$@" &
-wait \ No newline at end of file