Merge pull request #33 from makinacorpus/optims

Optims

Author: submarcos

.github/workflows/test.yml

@@ -37,6 +37,8 @@ jobs:
   eslint:
     runs-on: ubuntu-18.04
     name: Check javascript linting
+    env:
+      PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: 1
     steps:
       - uses: actions/checkout@v2
       - name: Setup node
@@ -67,7 +69,7 @@ jobs:
         sudo apt-get update -q
         sudo apt-get -q -y install nodejs npm ca-certificates
         python -m pip install --upgrade pip setuptools wheel
-        pip install -r requirements.txt -U
+        pip install -r dev-requirements.txt -U
         npm ci
     - name: Test with coverage
       run: |
@@ -85,7 +87,10 @@ jobs:
     needs: [test]
     steps:
       - uses: actions/checkout@v2
-      - name: Build docker image
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Build Docker image
         run: |
           docker build -t screamshotter_ci:latest .
       - name: Upload image

Dockerfile

@@ -4,9 +4,10 @@ ENV PYTHONUNBUFFERED 1
 ENV DEBIAN_FRONTEND noninteractive
 ENV LANG C.UTF-8
 ENV COLLECTSTATIC 1
-ARG NODE_ENV=production
+
 RUN useradd -ms /bin/bash django
 RUN mkdir -p /app
+RUN chown django:django /app
 
 RUN apt-get -qq update && apt-get install -qq -y \
     gconf-service \
@@ -62,27 +63,29 @@ ENTRYPOINT ["entrypoint.sh"]
 
 FROM base as dev
 
+ARG NODE_ENV=production
+ARG REQUIREMENTS=requirements.txt
+
 RUN apt-get -qq update && apt-get install -qq -y \
     build-essential \
     python3.8-dev python3.8-venv python3.8-distutils && \
     apt-get clean all && rm -rf /var/apt/lists/* && rm -rf /var/cache/apt/*
 
 # install pip & requirements
 RUN wget https://bootstrap.pypa.io/get-pip.py && python3.8 get-pip.py && rm get-pip.py
+
+USER django
 RUN python3.8 -m venv /app/venv
 RUN /app/venv/bin/pip3 install --no-cache-dir pip setuptools wheel -U
 
-COPY requirements.txt /requirements.txt
-RUN /app/venv/bin/pip3 install --no-cache-dir -r /requirements.txt -U
+COPY ${REQUIREMENTS} /app/requirements.txt
+RUN /app/venv/bin/pip3 install --no-cache-dir -r /app/requirements.txt -U && rm /app/requirements.txt
 RUN /app/venv/bin/nodeenv /app/venv/ -C '' -p -n 14.15.5
 
 # upgrade npm & requirements
 COPY package.json /app/package.json
 COPY package-lock.json /app/package-lock.json
-RUN . /app/venv/bin/activate && npm ci
-RUN mkdir -p /app/static
-RUN chown django:django -R /app
-USER django
+RUN . /app/venv/bin/activate && npm ci && rm /app/*.json
 
 CMD ["./manage.py", "runserver", "0.0.0.0:8000"]
 
@@ -93,7 +96,6 @@ COPY --from=dev /app/node_modules /app/node_modules
 COPY src /app/src
 
 RUN mkdir -p /app/static
-RUN chown django:django /app/static
 
 VOLUME /app/static
 

debian/changelog

@@ -1,6 +1,7 @@
-screamshotter (2.0.6) UNRELEASED; urgency=medium
+screamshotter (2.0.6) RELEASED; urgency=medium
 
   * Increase Puppeteer default timeouts
+  * Optimize npm install in debian packages
 
  -- Jean-Etienne Castagnede <[email protected]>  Fri, 20 Apr 2021 11:32:00 +0200
 

debian/rules

@@ -10,7 +10,7 @@ override_dh_virtualenv:
 	debian/screamshotter/opt/screamshotter/bin/python debian/screamshotter/opt/screamshotter/bin/pip install nodeenv==1.5.0
 	debian/screamshotter/opt/screamshotter/bin/nodeenv -C '' -p -n 14.15.5
 	cp package.json package-lock.json debian/screamshotter/opt/screamshotter/
-	. debian/screamshotter/opt/screamshotter/bin/activate && npm ci -g --unsafe-perm=true
+	. debian/screamshotter/opt/screamshotter/bin/activate && npm ci --production -g --unsafe-perm=true
 
 .PHONY: override_dh_strip override_dh_shlibdeps
 

dev-requirements.in

@@ -0,0 +1,7 @@
+-r requirements.txt
+
+coverage
+flake8
+Pillow
+python-magic
+django-debug-toolbar

dev-requirements.txt

@@ -0,0 +1,109 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile dev-requirements.in
+#
+asgiref==3.3.4
+    # via
+    #   -r requirements.txt
+    #   django
+certifi==2020.12.5
+    # via
+    #   -r requirements.txt
+    #   requests
+chardet==4.0.0
+    # via
+    #   -r requirements.txt
+    #   requests
+coreapi==2.3.3
+    # via -r requirements.txt
+coreschema==0.0.4
+    # via
+    #   -r requirements.txt
+    #   coreapi
+coverage==5.5
+    # via -r dev-requirements.in
+django-debug-toolbar==3.2.1
+    # via -r dev-requirements.in
+django==3.2
+    # via
+    #   -r requirements.txt
+    #   django-debug-toolbar
+    #   djangorestframework
+djangorestframework==3.12.4
+    # via -r requirements.txt
+flake8==3.9.1
+    # via -r dev-requirements.in
+gevent==21.1.2
+    # via
+    #   -r requirements.txt
+    #   gunicorn
+greenlet==1.0.0
+    # via
+    #   -r requirements.txt
+    #   gevent
+gunicorn[gevent]==20.1.0
+    # via -r requirements.txt
+idna==2.10
+    # via
+    #   -r requirements.txt
+    #   requests
+itypes==1.2.0
+    # via
+    #   -r requirements.txt
+    #   coreapi
+jinja2==2.11.3
+    # via
+    #   -r requirements.txt
+    #   coreschema
+markupsafe==1.1.1
+    # via
+    #   -r requirements.txt
+    #   jinja2
+mccabe==0.6.1
+    # via flake8
+nodeenv==1.6.0
+    # via -r requirements.txt
+pillow==8.2.0
+    # via -r dev-requirements.in
+pycodestyle==2.7.0
+    # via flake8
+pyflakes==2.3.1
+    # via flake8
+python-magic==0.4.22
+    # via -r dev-requirements.in
+pytz==2021.1
+    # via
+    #   -r requirements.txt
+    #   django
+requests==2.25.1
+    # via
+    #   -r requirements.txt
+    #   coreapi
+sqlparse==0.4.1
+    # via
+    #   -r requirements.txt
+    #   django
+    #   django-debug-toolbar
+uritemplate==3.0.1
+    # via
+    #   -r requirements.txt
+    #   coreapi
+urllib3==1.26.4
+    # via
+    #   -r requirements.txt
+    #   requests
+whitenoise==5.2.0
+    # via -r requirements.txt
+zope.event==4.5.0
+    # via
+    #   -r requirements.txt
+    #   gevent
+zope.interface==5.4.0
+    # via
+    #   -r requirements.txt
+    #   gevent
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools

docker-compose.yml

@@ -6,6 +6,7 @@ services:
       target: dev
       args:
         - NODE_ENV=development
+        - REQUIREMENTS=dev-requirements.txt
     volumes:
       - ./src/:/app/src/
     ports:

requirements.txt

@@ -14,19 +14,12 @@ coreapi==2.3.3
     # via screamshotter (setup.py)
 coreschema==0.0.4
     # via coreapi
-coverage==5.5
-    # via screamshotter (setup.py)
-django-debug-toolbar==3.2.1
-    # via screamshotter (setup.py)
 django==3.2
     # via
-    #   django-debug-toolbar
     #   djangorestframework
     #   screamshotter (setup.py)
 djangorestframework==3.12.4
     # via screamshotter (setup.py)
-flake8==3.9.1
-    # via screamshotter (setup.py)
 gevent==21.1.2
     # via gunicorn
 greenlet==1.0.0
@@ -41,26 +34,14 @@ jinja2==2.11.3
     # via coreschema
 markupsafe==1.1.1
     # via jinja2
-mccabe==0.6.1
-    # via flake8
 nodeenv==1.6.0
     # via screamshotter (setup.py)
-pillow==8.2.0
-    # via screamshotter (setup.py)
-pycodestyle==2.7.0
-    # via flake8
-pyflakes==2.3.1
-    # via flake8
-python-magic==0.4.22
-    # via screamshotter (setup.py)
 pytz==2021.1
     # via django
 requests==2.25.1
     # via coreapi
 sqlparse==0.4.1
-    # via
-    #   django
-    #   django-debug-toolbar
+    # via django
 uritemplate==3.0.1
     # via coreapi
 urllib3==1.26.4

setup.py

@@ -14,16 +14,9 @@
         'nodeenv',
         'djangorestframework',
         'coreapi',
-        # dev & tests
-        'coverage',
-        'flake8',
-        'Pillow',
-        'python-magic',
-        # dev project
-        'django-debug-toolbar',
+        'whitenoise',
         # prod
         'gunicorn[gevent]',
-        'whitenoise'
     ],
     include_package_data=True,
     license='BSD, see LICENSE file.',