Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 18, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 0 additions & 34 deletions images/base/git-core-ubuntu-ppa-noble.sources
View file
Open in desktop

This file was deleted.

19 changes: 2 additions & 17 deletions images/base/ubuntu.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*

Expand Down
Loading