Skip to content

Commit b631af5

Browse files
committed
fix
1 parent 59255b9 commit b631af5

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

Github/Runners/alpine-builder.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ RUN <<EOS
644644
apk add rubberband-static --latest --upgrade --no-interactive 2>/dev/null
645645
apk add rustup --latest --upgrade --no-interactive 2>/dev/null ; rustup-init -y
646646
#https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/community/rustup/APKBUILD#L8
647-
hash -r &>/dev/null
647+
hash -r >/dev/null 2>&1
648648
command -v cargo || apk add cargo --latest --upgrade --no-interactive 2>/dev/null
649649
apk add samurai --latest --upgrade --no-interactive 2>/dev/null
650650
apk add scons --latest --upgrade --no-interactive 2>/dev/null
@@ -806,7 +806,7 @@ RUN <<EOS
806806
#musl-gcc wrapper
807807
ln --symbolic "/usr/bin/$(uname -m)-alpine-linux-musl-gcc" "/usr/local/bin/musl-gcc" 2>/dev/null
808808
#Zig
809-
hash -r &>/dev/null
809+
hash -r >/dev/null 2>&1
810810
if ! command -v zig >/dev/null 2>&1; then
811811
cd "$(mktemp -d)" >/dev/null 2>&1
812812
curl -qfsSL "https://raw.githubusercontent.com/pkgforge/devscripts/refs/heads/main/Linux/install_zig.sh" -o "./install_zig.sh"

Github/Runners/alpine-slim.dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22
#------------------------------------------------------------------------------------#
3-
#https://hub.docker.com/r/pkgforge/alpine-builder
3+
#https://hub.docker.com/r/pkgforge/alpine-slim
44
#FROM alpine:edge
55
ARG ARCH
66
FROM "ghcr.io/pkgforge/devscripts/alpine:${ARCH}"
@@ -82,10 +82,6 @@ RUN <<EOS
8282
apk add python3-dev --latest --upgrade --no-cache --no-interactive 2>/dev/null
8383
apk add readline-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
8484
apk add rsync --latest --upgrade --no-cache --no-interactive 2>/dev/null
85-
apk add rustup --latest --upgrade --no-cache --no-interactive 2>/dev/null ; rustup-init -y
86-
#https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/community/rustup/APKBUILD#L8
87-
hash -r &>/dev/null
88-
command -v cargo || apk add cargo --latest --upgrade --no-cache --no-interactive 2>/dev/null
8985
apk add sed --latest --upgrade --no-cache --no-interactive 2>/dev/null
9086
apk add sqlite-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
9187
apk add sudo --latest --upgrade --no-cache --no-interactive 2>/dev/null

0 commit comments

Comments
 (0)