Fix orjson build on arm64 (#622)

Author: droserasprout

.github/workflows/build.yml

@@ -27,11 +27,12 @@ jobs:
     strategy:
       matrix:
         image:
-          # - name: default
-          #   suffix: ''
-          #   platforms: linux/amd64,linux/arm64
-          #   dockerfile: Dockerfile
-          #   build_args: 'DIPDUP_DOCKER_IMAGE=default'
+          # FIXME: Revert after fixing orjson build
+          - name: default
+            suffix: ''
+            platforms: linux/amd64,linux/arm64
+            dockerfile: Dockerfile
+            build_args: 'DIPDUP_DOCKER_IMAGE=default'
 
           # - name: pytezos
           #   suffix: -pytezos

.github/workflows/release.yml

@@ -73,7 +73,7 @@ jobs:
       - name: Set up Poetry
         uses: snok/install-poetry@v1
         with:
-          version: '1.3.2'
+          version: '1.4.0'
 
       - name: Install project
         run: make install

Dockerfile

@@ -3,62 +3,42 @@ FROM python:3.10-slim-buster AS compile-image
 ARG DIPDUP_DOCKER_IMAGE=default
 ENV DIPDUP_DOCKER=1
 ENV DIPDUP_DOCKER_IMAGE=${DIPDUP_DOCKER_IMAGE}
-ENV POETRY_VIRTUALENVS_IN_PROJECT=true
 
-SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]
-RUN <<eot
-    apt update
-    apt install -y gcc make git `if [[ $DIPDUP_DOCKER_IMAGE = "pytezos" ]]; then echo build-essential pkg-config libsodium-dev libsecp256k1-dev libgmp-dev; fi`
-
-    pip install --no-cache-dir poetry==1.3.2
-
-    mkdir -p /opt/dipdup
- 
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN apt update && \
+    apt install -y gcc make git curl `if [[ $DIPDUP_DOCKER_IMAGE = "pytezos" ]]; then echo build-essential pkg-config libsodium-dev libsecp256k1-dev libgmp-dev; fi` && \
+    python -m venv --without-pip --system-site-packages /opt/dipdup && \
+    mkdir -p /opt/dipdup/src/dipdup/ && \
+    touch /opt/dipdup/src/dipdup/__init__.py && \
     rm -r /var/log/* /var/lib/apt/lists/* /var/cache/* /var/lib/dpkg/status*
-eot
-
 WORKDIR /opt/dipdup
-ENV PATH="/opt/dipdup/.venv/bin:$PATH"
-
-COPY --chown=dipdup Makefile pyproject.toml poetry.lock README.md /opt/dipdup/
+ENV PATH="/opt/dipdup/bin:$PATH"
 
-RUN <<eot
-    # We want to copy our code at the last layer but not to break poetry's "packages" section
-    mkdir -p /opt/dipdup/src/dipdup
-    touch /opt/dipdup/src/dipdup/__init__.py
+COPY pyproject.toml requirements.txt requirements.pytezos.txt README.md /opt/dipdup/
 
-    make install DEV=0 `if [[ $DIPDUP_DOCKER_IMAGE = "pytezos" ]]; then echo PYTEZOS=1; fi`
-
-    rm -r /root/.cache/
-eot
+RUN /usr/local/bin/pip install --prefix /opt/dipdup --no-cache-dir --disable-pip-version-check --no-deps -r /opt/dipdup/requirements.`if [[ $DIPDUP_DOCKER_IMAGE = "pytezos" ]]; then echo "pytezos."; fi`txt -e .
 
 FROM python:3.10-slim-buster AS build-image
 
 ARG DIPDUP_DOCKER_IMAGE=default
 ENV DIPDUP_DOCKER=1
 ENV DIPDUP_DOCKER_IMAGE=${DIPDUP_DOCKER_IMAGE}
-ENV POETRY_VIRTUALENVS_IN_PROJECT=true
-
-SHELL ["/bin/bash", "-c"]
-
-RUN <<eot
-    useradd -ms /bin/bash dipdup
-    pip install --no-cache-dir poetry==1.3.2 setuptools
-
-    apt update
-    apt install -y --no-install-recommends git `if [[ $DIPDUP_DOCKER_IMAGE = "pytezos" ]]; then echo libsodium-dev libsecp256k1-dev libgmp-dev; fi`
 
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN useradd -ms /bin/bash dipdup && \
+    pip install --no-cache-dir poetry==1.4.0 setuptools && \
+    apt update && \
+    apt install -y --no-install-recommends git `if [[ $DIPDUP_DOCKER_IMAGE = "pytezos" ]]; then echo libsodium-dev libsecp256k1-dev libgmp-dev; fi` && \
     rm -r /var/log/* /var/lib/apt/lists/* /var/cache/* /var/lib/dpkg/status*
-eot
 
 USER dipdup
-ENV PATH="/opt/dipdup/.venv/bin:$PATH"
+ENV PATH="/opt/dipdup/bin:$PATH"
 ENV PYTHONPATH="/home/dipdup:/home/dipdup/src:/opt/dipdup/src:/opt/dipdup/lib/python3.10/site-packages:$PYTHONPATH"
 WORKDIR /home/dipdup/
 ENTRYPOINT ["dipdup"]
 CMD ["run"]
 
-COPY --chown=dipdup --chmod=0755 scripts/install_dependencies.sh /opt/dipdup/.venv/bin/install_dependencies
-COPY --chown=dipdup --chmod=0755 scripts/install_dependencies.sh /opt/dipdup/.venv/bin/inject_pyproject
+COPY --chown=dipdup --chmod=0755 scripts/install_dependencies.sh /opt/dipdup/bin/install_dependencies
+COPY --chown=dipdup --chmod=0755 scripts/install_dependencies.sh /opt/dipdup/bin/inject_pyproject
 COPY --chown=dipdup --from=compile-image /opt/dipdup /opt/dipdup
 COPY --chown=dipdup . /opt/dipdup

Dockerfile.slim

@@ -5,7 +5,6 @@ RUN apk add --update --no-cache build-base gcc musl-dev python3-dev libffi-dev o
     touch /opt/dipdup/src/dipdup/__init__.py
 WORKDIR /opt/dipdup
 ENV PATH="/opt/dipdup/bin:$PATH"
-ENV PYTHON_PATH="/opt/dipdup/src:$PATH"
 
 COPY pyproject.toml requirements.slim.txt README.md /opt/dipdup/
 

Makefile

@@ -60,13 +60,13 @@ image:          ## Build all Docker images
 	make image-slim
 
 image-default:  ## Build default Docker image
-	docker buildx build . --progress plain -t dipdup:${TAG} --build-arg DIPDUP_DOCKER_IMAGE=default
+	docker buildx build . --load --progress plain -t dipdup:${TAG} --build-arg DIPDUP_DOCKER_IMAGE=default
 
 image-pytezos:  ## Build pytezos Docker image
-	docker buildx build . --progress plain -t dipdup:${TAG}-pytezos --build-arg DIPDUP_DOCKER_IMAGE=pytezos
+	docker buildx build . --load --progress plain -t dipdup:${TAG}-pytezos --build-arg DIPDUP_DOCKER_IMAGE=pytezos
 
 image-slim:     ## Build slim Docker image
-	docker buildx build . --progress plain -t dipdup:${TAG}-slim -f Dockerfile.slim
+	docker buildx build . --load --progress plain -t dipdup:${TAG}-slim -f Dockerfile.slim
 
 ##