Skip to content

Commit 1bfb1e9

Browse files
committed
fix
1 parent e5bde78 commit 1bfb1e9

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

Github/Runners/alpine-ix.dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN <<EOS
1212
set +e
1313
apk update --no-interactive 2>/dev/null
1414
apk upgrade --latest --no-interactive 2>/dev/null
15-
apk add 7zip bash binutils build-base coreutils curl fakeroot findutils file g++ gcompat git grep jq libc-dev linux-headers lld llvm moreutils parted python3 rsync sudo tar tree util-linux wget xz zstd --latest --upgrade --no-interactive
15+
apk add 7zip bash binutils build-base coreutils curl fakeroot findutils file g++ gcompat git grep iputils jq libc-dev linux-headers lld llvm moreutils parted python3 rsync sudo tar tree util-linux wget xz zstd --latest --upgrade --no-interactive
1616
hash -r 2>/dev/null || true
1717
#Checks
1818
command -v bash || exit 1
@@ -48,7 +48,7 @@ RUN <<EOS
4848
#Install
4949
cd "$(mktemp -d)" >/dev/null 2>&1
5050
curl -qfsSL "https://raw.githubusercontent.com/pkgforge/devscripts/refs/heads/main/Linux/install_ix.sh" -o "./install.sh" && chmod +x "./install.sh"
51-
bash "./install.sh"
51+
bash "./install.sh" || true
5252
rm -rf "$(realpath .)" && cd - >/dev/null 2>&1 || true
5353
#Check
5454
if [ -z "${SYSTMP+x}" ] || [ -z "${SYSTMP##*[[:space:]]}" ]; then
@@ -67,8 +67,8 @@ RUN <<EOS
6767
#Configure ENV
6868
curl -qfsSL "https://raw.githubusercontent.com/pkgforge/devscripts/refs/heads/main/Linux/.bashrc" -o "/etc/bash.bashrc"
6969
ln --symbolic --force "/etc/bash.bashrc" "/root/.bashrc" 2>/dev/null
70-
ln --symbolic --force "/etc/bash.bashrc" "/home/alpine/.bashrc" 2>/dev/null
7170
ln --symbolic --force "/etc/bash.bashrc" "/etc/bash/bashrc" 2>/dev/null
71+
true
7272
EOS
7373
ENV GIT_ASKPASS="/bin/echo"
7474
ENV GIT_TERMINAL_PROMPT="0"

Github/Runners/debian-ix.dockerfile

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ RUN <<EOS
2323
#Install Actual Deps
2424
packages="bash binutils build-essential coreutils curl findutils file g++ git grep jq libc-dev moreutils patchelf python3 rsync sed sudo strace tar tree wget xz-utils zstd"
2525
for pkg in $packages; do DEBIAN_FRONTEND="noninteractive" apt install -y --ignore-missing "$pkg"; done
26+
#NetTools
27+
packages="dnsutils inetutils-ftp inetutils-ftpd inetutils-inetd inetutils-ping inetutils-syslogd inetutils-tools inetutils-traceroute iproute2 net-tools netcat-traditional"
28+
for pkg in $packages; do DEBIAN_FRONTEND="noninteractive" apt install -y --ignore-missing "$pkg"; done
29+
packages="iputils-arping iputils-clockdiff iputils-ping iputils-tracepath iproute2"
30+
for pkg in $packages; do DEBIAN_FRONTEND="noninteractive" apt install -y --ignore-missing "$pkg"; done
31+
setcap 'cap_net_raw+ep' "$(which ping)"
2632
hash -r 2>/dev/null || true
2733
#Checks
2834
command -v bash || exit 1
@@ -58,7 +64,7 @@ RUN <<EOS
5864
#Install
5965
cd "$(mktemp -d)" >/dev/null 2>&1
6066
curl -qfsSL "https://raw.githubusercontent.com/pkgforge/devscripts/refs/heads/main/Linux/install_ix.sh" -o "./install.sh" && chmod +x "./install.sh"
61-
bash "./install.sh"
67+
bash "./install.sh" || true
6268
rm -rf "$(realpath .)" && cd - >/dev/null 2>&1 || true
6369
#Check
6470
if [ -z "${SYSTMP+x}" ] || [ -z "${SYSTMP##*[[:space:]]}" ]; then
@@ -77,10 +83,21 @@ RUN <<EOS
7783
#Configure ENV
7884
curl -qfsSL "https://raw.githubusercontent.com/pkgforge/devscripts/refs/heads/main/Linux/.bashrc" -o "/etc/bash.bashrc"
7985
ln --symbolic --force "/etc/bash.bashrc" "/root/.bashrc" 2>/dev/null
80-
ln --symbolic --force "/etc/bash.bashrc" "/home/alpine/.bashrc" 2>/dev/null
8186
ln --symbolic --force "/etc/bash.bashrc" "/etc/bash/bashrc" 2>/dev/null
87+
#Locale
88+
echo "LC_ALL=en_US.UTF-8" | tee -a "/etc/environment"
89+
echo "en_US.UTF-8 UTF-8" | tee -a "/etc/locale.gen"
90+
echo "LANG=en_US.UTF-8" | tee -a "/etc/locale.conf"
91+
locale-gen "en_US.UTF-8"
92+
#Dialog
93+
echo "debconf debconf/frontend select Noninteractive" | debconf-set-selections
94+
debconf-show debconf
95+
true
8296
EOS
8397
ENV GIT_ASKPASS="/bin/echo"
8498
ENV GIT_TERMINAL_PROMPT="0"
99+
ENV LANG="en_US.UTF-8"
100+
ENV LANGUAGE="en_US:en"
101+
ENV LC_ALL="en_US.UTF-8"
85102
#------------------------------------------------------------------------------------#
86103
#END

0 commit comments

Comments
 (0)