From 5a75ae016bc69fb60935db4e424020d8a0ae06cf Mon Sep 17 00:00:00 2001
From: Matus Bursa <burso@burso.eu>
Date: Sun, 8 Dec 2024 19:56:25 +0100
Subject: [PATCH] added docker build context for using specific docker image

---
 .github/workflows/ghauri.yml | 4 ++--
 files/ghauri/Dockerfile      | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ghauri.yml b/.github/workflows/ghauri.yml
index 1b806a2..fe6c73f 100644
--- a/.github/workflows/ghauri.yml
+++ b/.github/workflows/ghauri.yml
@@ -48,8 +48,8 @@ jobs:
 
       - name: Build and push Docker image
         run: |
-          docker buildx build --push \
-            --build-arg "PYTHON_VERSION=${{ env.PYTHON_VERSION }}" --build-arg "RELEASE_VERSION=${{ env.RELEASE_VERSION }}" \
+          docker buildx build --push --build-context python=docker-image://python:${{ env.PYTHON_VERSION }}-alpine \
+            --build-arg "RELEASE_VERSION=${{ env.RELEASE_VERSION }}" \
             --tag ghcr.io/${{ github.repository_owner }}/ghauri:${{ env.RELEASE_VERSION }} \
             --tag ghcr.io/${{ github.repository_owner }}/ghauri:latest \
             --platform linux/amd64,linux/arm64 ./files/ghauri
diff --git a/files/ghauri/Dockerfile b/files/ghauri/Dockerfile
index f863fe9..eb93442 100644
--- a/files/ghauri/Dockerfile
+++ b/files/ghauri/Dockerfile
@@ -1,10 +1,8 @@
-ARG PYTHON_VERSION="${PYTHON_VERSION}" \
-    RELEASE_VERSION="${RELEASE_VERSION}"
+FROM python
 
-FROM python:"${PYTHON_VERSION}-alpine"
+ARG RELEASE_VERSION="${RELEASE_VERSION}"
 
-ENV PYTHON_VERSION=${PYTHON_VERSION} \
-    RELEASE_VERSION=${RELEASE_VERSION}
+ENV RELEASE_VERSION=${RELEASE_VERSION}
 # Install git
 RUN apk update && apk add --no-cache git