From 1b4f4bd3e8793df46350e8e2765fa77bf3ef8a73 Mon Sep 17 00:00:00 2001
From: Sindre Stephansen <sindre@sindrestephansen.com>
Date: Wed, 22 Jan 2025 12:00:06 +0100
Subject: [PATCH] Update sync Dockerfile to work with new version of Alpine

---
 sync/Dockerfile      | 6 ++++--
 sync/resolve-deps.sh | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sync/Dockerfile b/sync/Dockerfile
index 7c14335..aca15fc 100644
--- a/sync/Dockerfile
+++ b/sync/Dockerfile
@@ -17,10 +17,12 @@ RUN ./gradlew build
 
 WORKDIR /workdir
 
-RUN python3 -m ensurepip
+RUN apk add py3-pip
+RUN python3 -m venv /tmp/python-venv
+ENV CUSTOMPYTHON=/tmp/python-venv/bin/python
 
 COPY requirements.txt .
-RUN python3 -m pip install -r requirements.txt
+RUN /tmp/python-venv/bin/pip install -r requirements.txt
 
 COPY resolve-deps.sh .
 COPY src ./src
diff --git a/sync/resolve-deps.sh b/sync/resolve-deps.sh
index d22d6af..6680297 100755
--- a/sync/resolve-deps.sh
+++ b/sync/resolve-deps.sh
@@ -42,8 +42,8 @@ export GRADLE_VERSIONS_DIR=/gradle-versions
 mkdir -p "${GRADLE_VERSIONS_DIR}"
 
 echo "Resolving packages and generating gradle config"
-python3 --version
-if ! python3 src/main.py --repo="http://repo:80/releases" --output-dir "$PROJECTS_DIR" /package-list.yaml; then
+$CUSTOMPYTHON --version
+if ! $CUSTOMPYTHON src/main.py -vv --repo="http://repo:80/releases" --output-dir "$PROJECTS_DIR" /package-list.yaml; then
     echo "Gradle generation failed"
     exit 255
 fi