chore(images/base): revert workaround for broken packagekit on armv7 (#293) (#295)

This reverts commit d5a3b19.
Upstream bug has been fixed: https://bugs.launchpad.net/ubuntu/+source/packagekit/+bug/2091714

Author: johnstcn

images/base/git-core-ubuntu-ppa-noble.sources

@@ -30,31 +30,16 @@ RUN apt-get update && \
     pipx \
     python3 \
     python3-pip \
-# software-properties-common \
+    software-properties-common \
     sudo \
     systemd \
     systemd-sysv \
     unzip \
     vim \
     wget \
     rsync && \
-    rm -rf /var/lib/apt/lists/*
-
-# Compat: on non-armv7 architectures, install `software-properties-common`
-RUN [[ "$(dpkg --print-architecture)" != "armhf" ]] && \
-    ( \
-        apt-get update && \
-        apt-get install --yes software-properties-common && \
-        rm -rf /var/lib/apt/lists/* \
-    ) || echo "WARN: Skipping software-properties-common installation on armhf"
-
 # Install latest Git using their official PPA
-# Note: due to a dependency issue with the armv7 `software-properties-common` package,
-# we can't use `add-apt-repository` here. Instead, we'll add the Git PPA
-# manually. TODO: remove this workaround when the issue is resolved.
-# Ref: https://bugs.launchpad.net/cloud-images/+bug/2091619
-COPY git-core-ubuntu-ppa-noble.sources /etc/apt/sources.list.d/git-core-ubuntu-ppa-noble.sources
-RUN apt-get update && \
+    add-apt-repository ppa:git-core/ppa && \
     apt-get install --yes git \
     && rm -rf /var/lib/apt/lists/*