Skip to content

Commit 7bbd8ab

Browse files
committed
fix
1 parent 3fc86d2 commit 7bbd8ab

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

Github/Runners/ubuntu-systemd-base.dockerfile

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,9 @@ RUN <<EOS
137137
apt update -y
138138
packages="aria2 automake bc binutils b3sum build-essential ca-certificates ccache diffutils dos2unix findutils gawk lzip jq libtool libtool-bin make musl musl-dev musl-tools p7zip-full rsync texinfo wget xz-utils"
139139
for pkg in $packages; do apt install -y --ignore-missing "$pkg"; done
140-
apt install python3 -y
140+
apt install apt-transport-https apt-utils aria2 autoconf automake autopoint b3sum bc binutils bison build-essential byacc ca-certificates ccache clang cmake coreutils devscripts diffutils dos2unix file flex gawk git-lfs gnupg2 imagemagick jq liblz-dev libpcap-dev librust-lzma-sys-dev libsqlite3-dev libtool libtool-bin libxcb1-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev lm-sensors lzip lzma lzma-dev make moreutils musl musl-dev musl-tools netcat-traditional net-tools p7zip-full patch patchelf pcaputils pciutils pkg-config procps python3-distro python3-netifaces python3-pip python3-venv qemu-user-static rsync scons software-properties-common sqlite3 sqlite3-pcre sqlite3-tools sysfsutils texinfo tree util-linux virt-what wget xcb -y --ignore-missing 2>/dev/null
141+
apt install apt-transport-https apt-utils aria2 autoconf automake autopoint b3sum bc binutils bison build-essential byacc ca-certificates ccache clang cmake coreutils devscripts diffutils dos2unix file flex gawk git-lfs gnupg2 imagemagick jq liblz-dev libpcap-dev librust-lzma-sys-dev libsqlite3-dev libtool libtool-bin libxcb1-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev lm-sensors lzip lzma lzma-dev make moreutils musl musl-dev musl-tools netcat-traditional net-tools p7zip-full patch patchelf pcaputils pciutils pkg-config procps python3-distro python3-netifaces python3-pip python3-venv qemu-user-static rsync scons software-properties-common sqlite3 sqlite3-pcre sqlite3-tools sysfsutils texinfo tree util-linux virt-what wget xcb -y --ignore-missing 2>/dev/null
142+
true
141143
EOS
142144
#------------------------------------------------------------------------------------#
143145

@@ -224,18 +226,18 @@ RUN <<EOS
224226
EOS
225227
#------------------------------------------------------------------------------------#
226228

227-
#------------------------------------------------------------------------------------#
228-
##Install Podman
229-
RUN <<EOS
230-
#Install Podman
231-
VERSION="$(grep -oP 'VERSION_ID="\K[^"]+' "/etc/os-release")"
232-
echo "deb http://download.opensuse.org/repositories/home:/alvistack/xUbuntu_${VERSION}/ /" | tee "/etc/apt/sources.list.d/home:alvistack.list"
233-
curl -fsSL "https://download.opensuse.org/repositories/home:alvistack/xUbuntu_${VERSION}/Release.key" | gpg --dearmor | tee "/etc/apt/trusted.gpg.d/home_alvistack.gpg" >/dev/null
234-
apt update -y -qq ; apt install podman -y 2>/dev/null || true
235-
apt-get install containernetworking-plugins podman-netavark -y 2>/dev/null || true
236-
systemctl enable podman --now 2>/dev/null || true
237-
EOS
238-
#------------------------------------------------------------------------------------#
229+
##------------------------------------------------------------------------------------#
230+
###Install Podman
231+
#RUN <<EOS
232+
# #Install Podman
233+
# VERSION="$(grep -oP 'VERSION_ID="\K[^"]+' "/etc/os-release")"
234+
# echo "deb http://download.opensuse.org/repositories/home:/alvistack/xUbuntu_${VERSION}/ /" | tee "/etc/apt/sources.list.d/home:alvistack.list"
235+
# curl -fsSL "https://download.opensuse.org/repositories/home:alvistack/xUbuntu_${VERSION}/Release.key" | gpg --dearmor | tee "/etc/apt/trusted.gpg.d/home_alvistack.gpg" >/dev/null
236+
# apt update -y -qq ; apt install podman -y 2>/dev/null || true
237+
# apt-get install containernetworking-plugins podman-netavark -y 2>/dev/null || true
238+
# systemctl enable podman --now 2>/dev/null || true
239+
#EOS
240+
##------------------------------------------------------------------------------------#
239241

240242
#------------------------------------------------------------------------------------#
241243
#Start

0 commit comments

Comments
 (0)