Merge pull request #125 from snikket-im/fix/support-requirements-compilation

Dockerfile: Add dev headers required for building deps
2022-02-01 09:09:50 +00:00 · 2022-02-01 09:04:25 +00:00 · 2022-02-01 08:16:33 +00:00 · 2022-01-31 21:45:39 +00:00 · 2022-01-31 18:11:58 +00:00 · 2022-01-31 19:09:03 +01:00
2 changed files with 9 additions and 30 deletions
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -50,29 +50,6 @@ jobs:
        run: |
          python -m flake8 snikket_web

-  translation-check:
-    runs-on: ubuntu-latest
-
-    name: 'lint: i18n'
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: '3.9'
-      - name: Install
-        run: |
-          set -euo pipefail
-          pip install flask-babel
-      - name: Linting
-        run: |
-          sed -ri '/^"POT-Creation-Date: /d' snikket_web/translations/messages.pot
-          git add snikket_web/translations/messages.pot
-          make extract_translations
-          sed -ri '/^"POT-Creation-Date: /d' snikket_web/translations/messages.pot
-          git diff --exit-code --color -- snikket_web/translations/messages.pot
-
-
  build:
    runs-on: ubuntu-latest

--- a/16
+++ b/16
@@ -17,7 +17,8 @@ COPY babel.cfg /opt/snikket-web-portal/babel.cfg

 WORKDIR /opt/snikket-web-portal

-RUN pip3 install -r requirements.txt; \
+RUN set -eu; \
+    pip3 install -r requirements.txt; \
    pip3 install -r build-requirements.txt; \
    make;

@@ -35,20 +36,21 @@ ENV SNIKKET_WEB_PROSODY_ENDPOINT=http://127.0.0.1:5280/

 HEALTHCHECK CMD nc -zv ${SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_INTERFACE:-127.0.0.1} ${SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_PORT:-5765}

+COPY requirements.txt /opt/snikket-web-portal/requirements.txt
+
+WORKDIR /opt/snikket-web-portal
+
 RUN set -eu; \
    export DEBIAN_FRONTEND=noninteractive ; \
    apt-get update ; \
    apt-get install -y --no-install-recommends \
-        python3 python3-pip python3-setuptools python3-wheel; \
+        python3 python3-pip python3-setuptools python3-wheel build-essential libpython3-dev; \
+    pip3 install -r requirements.txt; \
+    apt-get remove -y --autoremove build-essential libpython3-dev; \
    apt-get clean ; rm -rf /var/lib/apt/lists; \
    pip3 install hypercorn; \
    rm -rf /root/.cache;

-WORKDIR /opt/snikket-web-portal
-
-COPY requirements.txt /opt/snikket-web-portal/requirements.txt
-RUN pip3 install -r requirements.txt; rm -rf /root/.cache;
-
 COPY --from=build /opt/snikket-web-portal/snikket_web/ /opt/snikket-web-portal/snikket_web
 COPY babel.cfg /opt/snikket-web-portal/babel.cfg
Author	SHA1	Message	Date
Matthew Wild	d4a38f5049	Merge pull request #125 from snikket-im/fix/support-requirements-compilation Dockerfile: Add dev headers required for building deps	2022-02-01 09:09:50 +00:00
Matthew Wild	344a4d3e93	Dockerfile: Add dev headers required for building deps	2022-02-01 09:04:25 +00:00
Matthew Wild	57f1047526	Merge pull request #124 from snikket-im/fix/support-requirements-compilation Dockerfile: Ensure a compiler is available while pip-installing requirements	2022-02-01 08:16:33 +00:00
Matthew Wild	b036caa85e	Dockerfile: Ensure a compiler is available while pip-installing requirements Dependencies are not necessarily packaged for all architectures. In some cases (such as aiohttp, and others, on ARM) pip will attempt to compile the dependency from scratch. Since switching to multi-stage builds, we have been installing these without a compiler present which caused the build to fail on ARM architectures. This commit temporarily installs build-essential packages while running pip, then removes them again afterwards.	2022-01-31 21:45:39 +00:00
Matthew Wild	08845cb9f0	Merge pull request #123 from snikket-im/hotfix/error-handling Fix error handling when building image	2022-01-31 18:11:58 +00:00
Jonas Schäfer	6aa6e12680	Fix error handling when building image Apparently, we managed to publish an image without working aiohttp because of this. Partially a regression from `5d7183a`.	2022-01-31 19:09:03 +01:00