From 197e1e91dd1d28e111088b7656d980424eb94497 Mon Sep 17 00:00:00 2001
From: Fabio Manganiello <fabio@manganiello.tech>
Date: Mon, 11 Nov 2024 23:45:44 +0100
Subject: [PATCH] [Build] Removed testing repo from Alpine images.

The testing repo is only required by `py3-marshmallow`, which is not yet
included in the community repo, but it can end up breaking some builds
because of the incompatibility with the packages in the base repo.
---
 .drone/rebuild-docs.sh                     | 2 +-
 .drone/run-tests.sh                        | 2 +-
 .drone/update-components-cache.sh          | 2 +-
 platypush/install/docker/alpine.Dockerfile | 2 +-
 platypush/install/requirements/alpine.txt  | 3 ++-
 platypush/install/scripts/alpine/PKGCMD    | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.drone/rebuild-docs.sh b/.drone/rebuild-docs.sh
index 720c907624..10b9cb6f8c 100755
--- a/.drone/rebuild-docs.sh
+++ b/.drone/rebuild-docs.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 echo "Installing required build dependencies"
-apk add --update --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing/ git make py3-sphinx py3-myst-parser py3-pip $(cat platypush/install/requirements/alpine.txt)
+apk add --update --no-cache git make py3-sphinx py3-myst-parser py3-pip $(cat platypush/install/requirements/alpine.txt)
 pip install -U sphinx-rtd-theme sphinx-book-theme --break-system-packages
 pip install . --break-system-packages
 mkdir -p /docs/current
diff --git a/.drone/run-tests.sh b/.drone/run-tests.sh
index 726b4979cb..74450a6714 100755
--- a/.drone/run-tests.sh
+++ b/.drone/run-tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-apk add --update --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing/ $(cat platypush/install/requirements/alpine.txt)
+apk add --update --no-cache $(cat platypush/install/requirements/alpine.txt)
 pip install . --break-system-packages
 pip install -r requirements-tests.txt --break-system-packages
 pytest tests
diff --git a/.drone/update-components-cache.sh b/.drone/update-components-cache.sh
index 910f936521..cc9a5b614b 100755
--- a/.drone/update-components-cache.sh
+++ b/.drone/update-components-cache.sh
@@ -23,7 +23,7 @@ fi
 . .drone/macros/configure-gpg.sh
 
 echo 'Updating components cache'
-apk add --update --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing/ $(cat platypush/install/requirements/alpine.txt)
+apk add --update --no-cache $(cat platypush/install/requirements/alpine.txt)
 pip install . --break-system-packages
 
 python - <<EOF
diff --git a/platypush/install/docker/alpine.Dockerfile b/platypush/install/docker/alpine.Dockerfile
index 20df11438b..63596c42b8 100644
--- a/platypush/install/docker/alpine.Dockerfile
+++ b/platypush/install/docker/alpine.Dockerfile
@@ -18,7 +18,7 @@ RUN --mount=type=bind,source=.,target=/curdir \
 
 RUN /install/platypush/install/scripts/alpine/install.sh && \
     cd /install && \
-    pip install -U --no-input --no-cache-dir --no-deps --ignore-installed --break-system-packages . croniter && \
+    pip install -U --no-input --no-cache-dir --no-deps --ignore-installed --break-system-packages . croniter marshmallow  && \
     rm -rf /install && \
     rm -rf /root/.cache && \
     apk del gcc git && \
diff --git a/platypush/install/requirements/alpine.txt b/platypush/install/requirements/alpine.txt
index 4c7fcaeca5..4570d6bd47 100644
--- a/platypush/install/requirements/alpine.txt
+++ b/platypush/install/requirements/alpine.txt
@@ -6,7 +6,6 @@ py3-docutils
 py3-flask
 py3-greenlet
 py3-magic
-py3-marshmallow
 py3-mypy-extensions
 py3-otp
 py3-psutil
@@ -16,11 +15,13 @@ py3-qrcode
 py3-redis
 py3-requests
 py3-rsa
+py3-simplejson
 py3-sqlalchemy
 py3-tornado
 py3-tz
 py3-websocket-client
 py3-websockets
+py3-wheel
 py3-yaml
 py3-zeroconf
 redis
diff --git a/platypush/install/scripts/alpine/PKGCMD b/platypush/install/scripts/alpine/PKGCMD
index 09f6fe5e4c..eba0c3d562 100644
--- a/platypush/install/scripts/alpine/PKGCMD
+++ b/platypush/install/scripts/alpine/PKGCMD
@@ -1 +1 @@
-apk add --update --no-interactive --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing/
+apk add --update --no-interactive --no-cache