From a20d492e5b9743a2e36aecb48106d34a64945df2 Mon Sep 17 00:00:00 2001
From: MarkKoz <KozlovMark@gmail.com>
Date: Sun, 24 Mar 2019 18:10:38 -0700
Subject: Docker: Replace tini with Docker's built-in init feature

Docker implemented this feature using tini too. Requires Docker Engine
18.06 or higher.
---
 docker/Dockerfile         | 6 +++---
 docker/docker-compose.yml | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index edeb5b50..c424af5a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,5 @@
 FROM python:3.7-alpine3.7
-RUN apk add --update libffi-dev tini build-base git jpeg-dev zlib zlib-dev
+RUN apk add --update libffi-dev build-base git jpeg-dev zlib zlib-dev
 
 RUN mkdir /bot
 COPY . /bot
@@ -11,5 +11,5 @@ ENV LIBRARY_PATH=/lib:/usr/lib \
 RUN pip install pipenv
 RUN pipenv install --deploy --system
 
-ENTRYPOINT ["/sbin/tini", "--"]
-CMD ["python", "-m", "bot"]
+ENTRYPOINT ["python"]
+CMD ["-m", "bot"]
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index de1f4cf2..6e274451 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,8 +1,9 @@
-version: "3"
+version: "3.7"
 services:
   dumbo:
     image: pythondiscord/seasonalbot:latest
     container_name: seasonalbot
+    init: true
 
     restart: always
 
-- 
cgit v1.2.3