Feature/change docker base image (#896)

* init change

* change mitm start command in docker

---------

Co-authored-by: noO0ob <[email protected]>

Author: noO0oOo0ob

Dockerfile

@@ -1,35 +1,30 @@
-FROM node:14.15-alpine as nodebuilder
+FROM node:16-slim as nodebuilder
 ARG USE_MIRROR 
 COPY . /usr/src
 WORKDIR /usr/src/frontend
 RUN if [[ -n "$USE_MIRROR" ]] ; then npm --registry https://registry.npmmirror.com install ; else npm install ; fi \
   && npm run build
 
-FROM python:3.8-alpine as pybuilder
+FROM python:3.9-slim
 ARG USE_MIRROR 
 ENV PYTHONUNBUFFERED 1
+ENV IS_DOCKER_CONTAINER 1
+
 COPY . /usr/src
 WORKDIR /usr/src
 COPY --from=nodebuilder /usr/src/lyrebird/client/ /usr/src/lyrebird/client/
-RUN if [[ -n "$USE_MIRROR" ]] ; then sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories ; fi \
-  && apk update \
-  && apk add --no-cache build-base jpeg-dev zlib-dev libffi-dev openssl-dev redis \
+
+RUN if [[ -n "$USE_MIRROR" ]] ; then sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list ; fi \
+  && apt-get update \
+  && apt-get install -y build-essential libjpeg-dev zlib1g-dev libffi-dev libssl-dev curl libstdc++6 tzdata redis-server \
   && if [[ -n "$USE_MIRROR" ]] ; then pip install --upgrade pip  -i https://pypi.tuna.tsinghua.edu.cn/simple && pip install --no-cache-dir . facebook-wda==0.8.1 jsonschema redis -i https://pypi.tuna.tsinghua.edu.cn/simple ; else pip install --upgrade pip && pip install --no-cache-dir . facebook-wda==0.8.1 jsonschema redis ; fi \
   && if [[ -n "$USE_MIRROR" ]] ; then pip install werkzeug==2.2.2 mitmproxy -t /usr/local/mitmenv -i https://pypi.tuna.tsinghua.edu.cn/simple ; else pip install werkzeug==2.2.2 mitmproxy -t /usr/local/mitmenv ; fi \
-  && rm -rf /usr/src \
-  && apk del --purge build-base jpeg-dev zlib-dev libffi-dev openssl-dev
-
-FROM python:3.8-alpine
-ARG USE_MIRROR 
-ENV PYTHONUNBUFFERED 1
-RUN if [[ -n "$USE_MIRROR" ]] ; then sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories ; fi \
-  && apk update \
-  && apk add --no-cache jpeg zlib libffi openssl curl libstdc++ tzdata redis\
   && echo -e "#!/bin/sh\nexport PYTHONPATH=/usr/local/mitmenv\npython -c 'from mitmproxy.tools.main import mitmdump;mitmdump()' \$@" > /usr/local/bin/mitmdump \
-  && chmod a+x /usr/local/bin/mitmdump
-COPY --from=pybuilder /usr/local/lib/python3.8/site-packages /usr/local/lib/python3.8/site-packages
-COPY --from=pybuilder /usr/local/bin /usr/local/bin
-COPY --from=pybuilder /usr/local/mitmenv /usr/local/mitmenv
+  && chmod a+x /usr/local/bin/mitmdump \
+  && rm -rf /usr/src \
+  && apt-get purge -y build-essential \
+  && apt-get autoremove -y \
+  && apt-get clean
 
 EXPOSE 9090 4272
 CMD [ "lyrebird" ]

lyrebird/mitm/proxy_server.py

@@ -85,8 +85,14 @@ def start_mitmdump(self, queue, config, logger, mitmdump_path):
         mitmenv['MOCK_PORT'] = str(mock_port)
         mitmenv['PROXY_PORT'] = str(extra_mock_port)
         mitmenv['PROXY_FILTERS'] = json.dumps(config.get('proxy.filters', []))
+        mitm_start_command = []
+        if os.environ.get('IS_DOCKER_CONTAINER'):
+            # The Docker environment lacks some command capabilities because it is a slim image. Therefore, /bin/sh needs to be manually specified
+            mitm_start_command = ['/bin/sh', str(mitmdump_path)] + mitm_arguments
+        else:
+            mitm_start_command = [str(mitmdump_path)] + mitm_arguments
         logger.info('HTTP proxy server starting...')
-        subprocess.Popen([str(mitmdump_path)]+mitm_arguments, env=mitmenv)
+        subprocess.Popen(mitm_start_command, env=mitmenv)
         is_mitm_start = self.wait_for_mitm_start(config, logger)
         if is_mitm_start:
             self.publish_init_status(queue, 'READY')

lyrebird/version.py

@@ -1,3 +1,3 @@
-IVERSION = (3, 2, 2)
+IVERSION = (3, 2, 3)
 VERSION = ".".join(str(i) for i in IVERSION)
 LYREBIRD = "Lyrebird " + VERSION