Merge pull request breuerfelix#89 from agusalex/master

Fixed Client Docker container not working with instapy Firefox update
gtunene · Oct 24, 2019 · 95d7635 · 95d7635
2 parents c199ab5 + 4c87271
commit 95d7635
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 22 deletions.
diff --git a/services/instapy/Dockerfile b/services/instapy/Dockerfile
@@ -1,23 +1,16 @@
-FROM python:3-alpine
+FROM python:3.7-slim-buster
 
 WORKDIR /usr/instapy
 
 COPY . .
 
-RUN apk add --update --no-cache --virtual .build-dependencies \
-	python3-dev \
-	gcc \
-	musl-dev \
-	g++ \
-	libffi-dev \
-	libressl-dev \
-  && pip3 install -r requirements.txt \
-  && pip3 uninstall -y instapy-chromedriver \
-  && apk del .build-dependencies
+RUN sed -i "s#deb http://deb.debian.org/debian buster main#deb http://deb.debian.org/debian buster main contrib non-free#g" /etc/apt/sources.list \
+	&& apt-get update && apt-get install -y --no-install-recommends \
+    	wget=1.20.1-1.1 gcc=4:8.3.0-1 g++=4:8.3.0-1 \
+	firefox-esr=60.8.0esr-1~deb10u1 firefoxdriver=3.14.1-1\
+ 	&& apt-get clean \
+ 	&& rm -rf /var/lib/apt/lists/*
+
+RUN pip3 install -r requirements.txt;
 
-RUN apk --update --no-cache add \
-  chromium \
-  chromium-chromedriver
-
-ENV CHROMEDRIVER_PATH=/usr/bin/chromedriver
 CMD ["python3", "-u", "start.py"]
diff --git a/services/instapy/bot.py b/services/instapy/bot.py
@@ -16,7 +16,6 @@
 ident = getenv('IDENT')
 config_endpoint = getenv('CONFIG')
 socket_endpoint = getenv('SOCKET')
-chromedriver_path = getenv('CHROMEDRIVER_PATH', None)
 
 if not namespace or not token:
     sys.exit(0)

diff --git a/services/instapy/requirements.txt b/services/instapy/requirements.txt
@@ -1,4 +1,4 @@
 instapy
 websocket-client
 requests
-python-dotenv
+python-dotenv
diff --git a/services/instapy/start.py b/services/instapy/start.py
@@ -19,7 +19,6 @@
 CONFIG_ENDPOINT = os.getenv('CONFIG_ENDPOINT', 'https://config.instapy.io')
 SOCKET_ENDPOINT = os.getenv('SOCKET_ENDPOINT', 'wss://socket.instapy.io')
 IDENT = os.getenv('IDENT')
-CHROMEDRIVER_PATH = os.getenv('CHROMEDRIVER_PATH', None)
 
 if not IDENT:
     print('IDENT not provided')
@@ -132,7 +131,6 @@ def start(ws, data):
     global IDENT
     global NAMESPACE
     global SETTING
-    global CHROMEDRIVER_PATH
 
     ienv = os.environ.copy()
     ienv['TOKEN'] = TOKEN
@@ -143,8 +141,6 @@ def start(ws, data):
     ienv['SOCKET'] = SOCKET_ENDPOINT
     ienv['CONFIG'] = CONFIG_ENDPOINT
     ienv['IDENT'] = IDENT
-    if CHROMEDRIVER_PATH:
-        ienv['CHROMEDRIVER_PATH'] = CHROMEDRIVER_PATH
 
     if platform.system() == 'Windows':
         PROCESS = subprocess.Popen(