ARM build (#196)

* ARM Build * ARM Build
stakewise · Oct 12, 2023 · 1c226fd · 1c226fd
1 parent 1b40847
commit 1c226fd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.10.10
+          python-version: 3.10.13
 
       # Install poetry
       - name: Load cached Poetry installation
@@ -58,7 +58,7 @@ jobs:
       - name: Set up python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.10.10
+          python-version: 3.10.13
 
       # Install poetry
       - name: Load cached Poetry installation
@@ -96,7 +96,7 @@ jobs:
       - name: Set up python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.10.10
+          python-version: 3.10.13
 
       # Install poetry
       - name: Load cached Poetry installation

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -34,6 +34,7 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64
   scanner:
     name: Trivy scanner
     runs-on: ubuntu-latest

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         include:
           - OS: ubuntu-20.04
-            PYTHON_VERSION: 3.10.10
+            PYTHON_VERSION: 3.10.13
             BUILD_CMD: |
               export PYTHONHASHSEED=42
               export BUILD_FILE_NAME=operator-${RELEASE_VERSION}-linux-amd64;
@@ -27,7 +27,7 @@ jobs:
               sha256sum ${BUILD_FILE_NAME}.tar.gz | head -c 64 > /tmp/artifacts/${BUILD_FILE_NAME}.sha256;
 
           - OS: macos-11
-            PYTHON_VERSION: 3.10.10
+            PYTHON_VERSION: 3.10.13
             BUILD_CMD: |
               export PYTHONHASHSEED=42
               export BUILD_FILE_NAME=operator-${RELEASE_VERSION}-darwin-amd64;
@@ -42,7 +42,7 @@ jobs:
               shasum -a 256 ${BUILD_FILE_NAME}.tar.gz | head -c 64 > /tmp/artifacts/${BUILD_FILE_NAME}.sha256
 
           - OS: windows-latest
-            PYTHON_VERSION: 3.10.10
+            PYTHON_VERSION: 3.10.13
             BUILD_CMD: |
               $RELEASE_VERSION = $env:GITHUB_REF.replace('refs/tags/', '')
               $BUILD_FILE_NAME = "operator-" + $RELEASE_VERSION + "-windows-amd64"

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # `python-base` sets up all our shared environment variables
-FROM python:3.10-alpine as python-base
+FROM python:3.10.13-slim-bookworm as python-base
 
     # python
 ENV PYTHONUNBUFFERED=1 \
@@ -34,11 +34,11 @@ ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:/root/.cargo/bin:$PATH"
 # `builder-base` stage is used to build deps + create our virtual environment
 FROM python-base as builder-base
 
-RUN apk upgrade --no-cache
-RUN apk add --no-cache gcc musl-dev python3-dev libffi-dev openssl-dev curl libgcc libstdc++ postgresql-libs postgresql-dev
+RUN apt-get update
+RUN apt-get upgrade -y; apt-get install --no-install-recommends -y build-essential curl libpq-dev postgresql-client && \
+    rm -rf /var/lib/apt/lists/*
 RUN curl https://sh.rustup.rs -sSf | \
     sh -s -- --default-toolchain stable -y
-RUN rm -rf /var/cache/apt/*
 
 # install poetry - respects $POETRY_VERSION & $POETRY_HOME
 RUN curl -sSL https://install.python-poetry.org | python -