From f15922ceb5698c1773256cf537568956e1f7677a Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Wed, 2 Mar 2022 09:25:29 +0100 Subject: [PATCH 1/4] testing cryptography builds with rustc --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2e0bddb1..43847b4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,9 +15,7 @@ WORKDIR /opt/recipes COPY requirements.txt ./ -RUN sed -i '/cryptography==/d' ./requirements.txt - -RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev libressl-dev python3-dev libffi-dev cargo openldap-dev && \ +RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev libressl-dev libffi-dev cargo openssl-dev openldap-dev build-essential rustc && \ echo -n "INPUT ( libldap.so )" > /usr/lib/libldap_r.so && \ python -m venv venv && \ /opt/recipes/venv/bin/python -m pip install --upgrade pip && \ From 447a16dcd582726c973dd21c318f917358fc7d79 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Wed, 2 Mar 2022 09:28:28 +0100 Subject: [PATCH 2/4] re enabled disabled architectures --- .github/workflows/docker-publish-latest.yml | 1 - .github/workflows/docker-publish-release.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/docker-publish-latest.yml b/.github/workflows/docker-publish-latest.yml index b4b9769f..07ab1869 100644 --- a/.github/workflows/docker-publish-latest.yml +++ b/.github/workflows/docker-publish-latest.yml @@ -39,6 +39,5 @@ jobs: publish: true imageName: vabene1111/recipes tag: latest - platform: linux/amd64,linux/arm64 dockerUser: ${{ secrets.DOCKER_USERNAME }} dockerPassword: ${{ secrets.DOCKER_PASSWORD }} diff --git a/.github/workflows/docker-publish-release.yml b/.github/workflows/docker-publish-release.yml index 64e572ba..636ed576 100644 --- a/.github/workflows/docker-publish-release.yml +++ b/.github/workflows/docker-publish-release.yml @@ -41,7 +41,6 @@ jobs: publish: true imageName: vabene1111/recipes tag: ${{ steps.get_version.outputs.VERSION }} - platform: linux/amd64,linux/arm64 dockerUser: ${{ secrets.DOCKER_USERNAME }} dockerPassword: ${{ secrets.DOCKER_PASSWORD }} # Send discord notification From 51f44e4926eadbd8ec28b9b72954ad4e17091f80 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Wed, 2 Mar 2022 09:37:11 +0100 Subject: [PATCH 3/4] testing with py dev --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 43847b4b..25df2b76 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ WORKDIR /opt/recipes COPY requirements.txt ./ -RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev libressl-dev libffi-dev cargo openssl-dev openldap-dev build-essential rustc && \ +RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev libressl-dev libffi-dev cargo openssl-dev openldap-dev python3-dev && \ echo -n "INPUT ( libldap.so )" > /usr/lib/libldap_r.so && \ python -m venv venv && \ /opt/recipes/venv/bin/python -m pip install --upgrade pip && \ From d7379d8ab631aced74d504408eece5e122edee17 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Wed, 2 Mar 2022 09:39:54 +0100 Subject: [PATCH 4/4] testing with setuptools_rust --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 25df2b76..bd69b911 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,7 @@ RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-de python -m venv venv && \ /opt/recipes/venv/bin/python -m pip install --upgrade pip && \ venv/bin/pip install wheel==0.37.1 && \ + venv/bin/pip install setuptools_rust==1.1.2 && \ venv/bin/pip install -r requirements.txt --no-cache-dir &&\ apk --purge del .build-deps