Skip to content

Commit 59255b9

Browse files
AzathothasAzathothas
committed
slim
1 parent a1ace5e commit 59255b9

File tree

2 files changed

+97
-112
lines changed

2 files changed

+97
-112
lines changed

‎Github/Runners/alpine-slim.dockerfile‎

Lines changed: 93 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -9,113 +9,101 @@ FROM "ghcr.io/pkgforge/devscripts/alpine:${ARCH}"
99
RUN <<EOS
1010
set +e
1111
apk update && apk upgrade --no-interactive 2>/dev/null
12-
apk add alpine-sdk --latest --upgrade --no-interactive 2>/dev/null
13-
apk add autoconf --latest --upgrade --no-interactive 2>/dev/null
14-
apk add autoconf-archive --latest --upgrade --no-interactive 2>/dev/null
15-
apk add automake --latest --upgrade --no-interactive 2>/dev/null
16-
apk add b3sum --latest --upgrade --no-interactive 2>/dev/null
17-
apk add bash --latest --upgrade --no-interactive 2>/dev/null
18-
apk add bc --latest --upgrade --no-interactive 2>/dev/null
19-
apk add binutils --latest --upgrade --no-interactive 2>/dev/null
20-
apk add brotli-static --latest --upgrade --no-interactive 2>/dev/null
21-
apk add build-base --latest --upgrade --no-interactive 2>/dev/null
22-
apk add bzip2-static --latest --upgrade --no-interactive 2>/dev/null
23-
apk add bzip3-static --latest --upgrade --no-interactive 2>/dev/null
24-
apk add c-ares-dev --latest --upgrade --no-interactive 2>/dev/null
25-
apk add ca-certificates --latest --upgrade --no-interactive 2>/dev/null
26-
apk add cairo-static --latest --upgrade --no-interactive 2>/dev/null
27-
apk add clang --latest --upgrade --no-interactive 2>/dev/null
28-
apk add clang-static --latest --upgrade --no-interactive 2>/dev/null
29-
apk add cmake --latest --upgrade --no-interactive 2>/dev/null
30-
apk add coreutils --latest --upgrade --no-interactive 2>/dev/null
31-
apk add croc --latest --upgrade --no-interactive 2>/dev/null
32-
apk add curl --latest --upgrade --no-interactive 2>/dev/null
33-
apk add curl-static --latest --upgrade --no-interactive 2>/dev/null
34-
apk add diffutils --latest --upgrade --no-interactive 2>/dev/null
35-
apk add dos2unix --latest --upgrade --no-interactive 2>/dev/null
36-
apk add file --latest --upgrade --no-interactive 2>/dev/null
37-
apk add findutils --latest --upgrade --no-interactive 2>/dev/null
38-
apk add fuse --latest --upgrade --no-interactive 2>/dev/null
39-
apk add fuse-static --latest --upgrade --no-interactive 2>/dev/null
40-
apk add fuse3 --latest --upgrade --no-interactive 2>/dev/null
41-
apk add fuse3-static --latest --upgrade --no-interactive 2>/dev/null
42-
apk add g++ --latest --upgrade --no-interactive 2>/dev/null
43-
apk add gawk --latest --upgrade --no-interactive 2>/dev/null
44-
apk add gcc --latest --upgrade --no-interactive 2>/dev/null
45-
apk add gettext-static --latest --upgrade --no-interactive 2>/dev/null
46-
apk add git --latest --upgrade --no-interactive 2>/dev/null
47-
apk add gnupg --latest --upgrade --no-interactive 2>/dev/null
48-
apk add grep --latest --upgrade --no-interactive 2>/dev/null
49-
apk add iputils --latest --upgrade --no-interactive 2>/dev/null
50-
apk add jq --latest --upgrade --no-interactive 2>/dev/null
51-
apk add libarchive-static --latest --upgrade --no-interactive 2>/dev/null
52-
apk add libc-dev --latest --upgrade --no-interactive 2>/dev/null
53-
apk add libcap-static --latest --upgrade --no-interactive 2>/dev/null
54-
apk add libcap-ng-static --latest --upgrade --no-interactive 2>/dev/null
55-
apk add libcurl --latest --upgrade --no-interactive 2>/dev/null
56-
apk add libssh2-static --latest --upgrade --no-interactive 2>/dev/null
57-
apk add libx11-static --latest --upgrade --no-interactive 2>/dev/null
58-
apk add libxcb-static --latest --upgrade --no-interactive 2>/dev/null
59-
apk add libxi-static --latest --upgrade --no-interactive 2>/dev/null
60-
apk add libxkbcommon-static --latest --upgrade --no-interactive 2>/dev/null
61-
apk add libxmlb --latest --upgrade --no-interactive 2>/dev/null
62-
apk add libxml2-static --latest --upgrade --no-interactive 2>/dev/null
63-
apk add libzmq-static --latest --upgrade --no-interactive 2>/dev/null
64-
apk add lld --latest --upgrade --no-interactive 2>/dev/null
65-
apk add linux-headers --latest --upgrade --no-interactive 2>/dev/null
66-
apk add llvm --latest --upgrade --no-interactive 2>/dev/null
67-
apk add llvm-libs --latest --upgrade --no-interactive 2>/dev/null
68-
apk add llvm-linker-tools --latest --upgrade --no-interactive 2>/dev/null
69-
apk add llvm-static --latest --upgrade --no-interactive 2>/dev/null
70-
apk add lz4-static --latest --upgrade --no-interactive 2>/dev/null
71-
apk add make --latest --upgrade --no-interactive 2>/dev/null
72-
apk add mold --latest --upgrade --no-interactive 2>/dev/null
73-
apk add moreutils --latest --upgrade --no-interactive 2>/dev/null
74-
apk add musl --latest --upgrade --no-interactive 2>/dev/null
75-
apk add musl-dev --latest --upgrade --no-interactive 2>/dev/null
76-
apk add musl-fts --latest --upgrade --no-interactive 2>/dev/null
77-
apk add musl-fts-dev --latest --upgrade --no-interactive 2>/dev/null
78-
apk add musl-utils --latest --upgrade --no-interactive 2>/dev/null
79-
apk add nano --latest --upgrade --no-interactive 2>/dev/null
80-
apk add nasm --latest --upgrade --no-interactive 2>/dev/null
81-
apk add ncdu --latest --upgrade --no-interactive 2>/dev/null
82-
apk add ncurses-static --latest --upgrade --no-interactive 2>/dev/null
83-
apk add net-tools --latest --upgrade --no-interactive 2>/dev/null
84-
apk add openssl --latest --upgrade --no-interactive 2>/dev/null
85-
apk add openssl-dev --latest --upgrade --no-interactive 2>/dev/null
86-
apk add openssl-libs-static --latest --upgrade --no-interactive 2>/dev/null
87-
apk add patchelf --latest --upgrade --no-interactive 2>/dev/null
88-
apk add pcre-dev --latest --upgrade --no-interactive 2>/dev/null
89-
apk add pcre2-dev --latest --upgrade --no-interactive 2>/dev/null
90-
apk add pkgconfig --latest --upgrade --no-interactive 2>/dev/null
91-
apk add python3 --latest --upgrade --no-interactive 2>/dev/null
92-
apk add python3-dev --latest --upgrade --no-interactive 2>/dev/null
93-
apk add readline-static --latest --upgrade --no-interactive 2>/dev/null
94-
apk add rsync --latest --upgrade --no-interactive 2>/dev/null
95-
apk add rustup --latest --upgrade --no-interactive 2>/dev/null ; rustup-init -y
12+
apk add alpine-sdk --latest --upgrade --no-cache --no-interactive 2>/dev/null
13+
apk add autoconf --latest --upgrade --no-cache --no-interactive 2>/dev/null
14+
apk add automake --latest --upgrade --no-cache --no-interactive 2>/dev/null
15+
apk add b3sum --latest --upgrade --no-cache --no-interactive 2>/dev/null
16+
apk add bash --latest --upgrade --no-cache --no-interactive 2>/dev/null
17+
apk add bc --latest --upgrade --no-cache --no-interactive 2>/dev/null
18+
apk add binutils --latest --upgrade --no-cache --no-interactive 2>/dev/null
19+
apk add brotli-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
20+
apk add build-base --latest --upgrade --no-cache --no-interactive 2>/dev/null
21+
apk add bzip2-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
22+
apk add bzip3-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
23+
apk add c-ares-dev --latest --upgrade --no-cache --no-interactive 2>/dev/null
24+
apk add ca-certificates --latest --upgrade --no-cache --no-interactive 2>/dev/null
25+
apk add cairo-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
26+
apk add clang --latest --upgrade --no-cache --no-interactive 2>/dev/null
27+
apk add cmake --latest --upgrade --no-cache --no-interactive 2>/dev/null
28+
apk add coreutils --latest --upgrade --no-cache --no-interactive 2>/dev/null
29+
apk add croc --latest --upgrade --no-cache --no-interactive 2>/dev/null
30+
apk add curl --latest --upgrade --no-cache --no-interactive 2>/dev/null
31+
apk add curl-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
32+
apk add diffutils --latest --upgrade --no-cache --no-interactive 2>/dev/null
33+
apk add dos2unix --latest --upgrade --no-cache --no-interactive 2>/dev/null
34+
apk add file --latest --upgrade --no-cache --no-interactive 2>/dev/null
35+
apk add findutils --latest --upgrade --no-cache --no-interactive 2>/dev/null
36+
apk add fuse-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
37+
apk add fuse3 --latest --upgrade --no-cache --no-interactive 2>/dev/null
38+
apk add fuse3-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
39+
apk add g++ --latest --upgrade --no-cache --no-interactive 2>/dev/null
40+
apk add gawk --latest --upgrade --no-cache --no-interactive 2>/dev/null
41+
apk add gcc --latest --upgrade --no-cache --no-interactive 2>/dev/null
42+
apk add gettext-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
43+
apk add git --latest --upgrade --no-cache --no-interactive 2>/dev/null
44+
apk add grep --latest --upgrade --no-cache --no-interactive 2>/dev/null
45+
apk add iputils --latest --upgrade --no-cache --no-interactive 2>/dev/null
46+
apk add jq --latest --upgrade --no-cache --no-interactive 2>/dev/null
47+
apk add libarchive-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
48+
apk add libc-dev --latest --upgrade --no-cache --no-interactive 2>/dev/null
49+
apk add libcap-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
50+
apk add libcap-ng-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
51+
apk add libcurl --latest --upgrade --no-cache --no-interactive 2>/dev/null
52+
apk add libssh2-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
53+
apk add libx11-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
54+
apk add libxcb-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
55+
apk add libxi-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
56+
apk add libxkbcommon-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
57+
apk add libxmlb --latest --upgrade --no-cache --no-interactive 2>/dev/null
58+
apk add libxml2-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
59+
apk add lld --latest --upgrade --no-cache --no-interactive 2>/dev/null
60+
apk add linux-headers --latest --upgrade --no-cache --no-interactive 2>/dev/null
61+
apk add llvm --latest --upgrade --no-cache --no-interactive 2>/dev/null
62+
apk add llvm-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
63+
apk add lz4-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
64+
apk add make --latest --upgrade --no-cache --no-interactive 2>/dev/null
65+
apk add mold --latest --upgrade --no-cache --no-interactive 2>/dev/null
66+
apk add moreutils --latest --upgrade --no-cache --no-interactive 2>/dev/null
67+
apk add musl --latest --upgrade --no-cache --no-interactive 2>/dev/null
68+
apk add musl-dev --latest --upgrade --no-cache --no-interactive 2>/dev/null
69+
apk add nano --latest --upgrade --no-cache --no-interactive 2>/dev/null
70+
apk add nasm --latest --upgrade --no-cache --no-interactive 2>/dev/null
71+
apk add ncdu --latest --upgrade --no-cache --no-interactive 2>/dev/null
72+
apk add ncurses-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
73+
apk add net-tools --latest --upgrade --no-cache --no-interactive 2>/dev/null
74+
apk add openssl --latest --upgrade --no-cache --no-interactive 2>/dev/null
75+
apk add openssl-dev --latest --upgrade --no-cache --no-interactive 2>/dev/null
76+
apk add openssl-libs-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
77+
apk add patchelf --latest --upgrade --no-cache --no-interactive 2>/dev/null
78+
apk add pcre-dev --latest --upgrade --no-cache --no-interactive 2>/dev/null
79+
apk add pcre2-dev --latest --upgrade --no-cache --no-interactive 2>/dev/null
80+
apk add pkgconfig --latest --upgrade --no-cache --no-interactive 2>/dev/null
81+
apk add python3 --latest --upgrade --no-cache --no-interactive 2>/dev/null
82+
apk add python3-dev --latest --upgrade --no-cache --no-interactive 2>/dev/null
83+
apk add readline-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
84+
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
9686
#https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/community/rustup/APKBUILD#L8
9787
hash -r &>/dev/null
98-
command -v cargo || apk add cargo --latest --upgrade --no-interactive 2>/dev/null
99-
apk add samurai --latest --upgrade --no-interactive 2>/dev/null
100-
apk add sed --latest --upgrade --no-interactive 2>/dev/null
101-
apk add sqlite-static --latest --upgrade --no-interactive 2>/dev/null
102-
apk add sudo --latest --upgrade --no-interactive 2>/dev/null
103-
apk add tar --latest --upgrade --no-interactive 2>/dev/null
104-
apk add tree --latest --upgrade --no-interactive 2>/dev/null
105-
apk add tzdata --latest --upgrade --no-interactive 2>/dev/null
106-
apk add upx --latest --upgrade --no-interactive 2>/dev/null
107-
apk add util-linux-static --latest --upgrade --no-interactive 2>/dev/null
108-
apk add wayland-static --latest --upgrade --no-interactive 2>/dev/null
109-
apk add wget --latest --upgrade --no-interactive 2>/dev/null
110-
apk add xxd --latest --upgrade --no-interactive 2>/dev/null
111-
apk add xxhash --latest --upgrade --no-interactive 2>/dev/null
112-
apk add xz --latest --upgrade --no-interactive 2>/dev/null
113-
apk add xz-static --latest --upgrade --no-interactive 2>/dev/null
114-
apk add yaml-static --latest --upgrade --no-interactive 2>/dev/null
115-
apk add zlib-static --latest --upgrade --no-interactive 2>/dev/null
116-
apk add zstd --latest --upgrade --no-interactive 2>/dev/null
117-
apk add zstd-static --latest --upgrade --no-interactive 2>/dev/null
118-
apk add 7zip --latest --upgrade --no-interactive 2>/dev/null
88+
command -v cargo || apk add cargo --latest --upgrade --no-cache --no-interactive 2>/dev/null
89+
apk add sed --latest --upgrade --no-cache --no-interactive 2>/dev/null
90+
apk add sqlite-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
91+
apk add sudo --latest --upgrade --no-cache --no-interactive 2>/dev/null
92+
apk add tar --latest --upgrade --no-cache --no-interactive 2>/dev/null
93+
apk add tree --latest --upgrade --no-cache --no-interactive 2>/dev/null
94+
apk add tzdata --latest --upgrade --no-cache --no-interactive 2>/dev/null
95+
apk add util-linux-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
96+
apk add wayland-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
97+
apk add wget --latest --upgrade --no-cache --no-interactive 2>/dev/null
98+
apk add xxd --latest --upgrade --no-cache --no-interactive 2>/dev/null
99+
apk add xxhash --latest --upgrade --no-cache --no-interactive 2>/dev/null
100+
apk add xz --latest --upgrade --no-cache --no-interactive 2>/dev/null
101+
apk add xz-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
102+
apk add yaml-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
103+
apk add zlib-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
104+
apk add zstd --latest --upgrade --no-cache --no-interactive 2>/dev/null
105+
apk add zstd-static --latest --upgrade --no-cache --no-interactive 2>/dev/null
106+
apk add 7zip --latest --upgrade --no-cache --no-interactive 2>/dev/null
119107
#Stats
120108
apk stats
121109
EOS

‎Linux/rbuilder.sh‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -256,31 +256,31 @@ determine_target_and_image() {
256256
# Determine container image and platform based on target
257257
case "${RUST_TARGET}" in
258258
x86_64-unknown-linux-musl)
259-
CONTAINER_IMAGE="ghcr.io/pkgforge/devscripts/alpine-builder:x86_64"
259+
CONTAINER_IMAGE="ghcr.io/pkgforge/devscripts/alpine-slim:x86_64"
260260
CONTAINER_PLATFORM="linux/amd64"
261261
;;
262262
x86_64-unknown-linux-gnu)
263263
CONTAINER_IMAGE="ghcr.io/pkgforge/devscripts/debian-builder-unstable:x86_64"
264264
CONTAINER_PLATFORM="linux/amd64"
265265
;;
266266
aarch64-unknown-linux-musl)
267-
CONTAINER_IMAGE="ghcr.io/pkgforge/devscripts/alpine-builder:aarch64"
267+
CONTAINER_IMAGE="ghcr.io/pkgforge/devscripts/alpine-slim:aarch64"
268268
CONTAINER_PLATFORM="linux/aarch64"
269269
;;
270270
aarch64-unknown-linux-gnu)
271271
CONTAINER_IMAGE="ghcr.io/pkgforge/devscripts/debian-builder-unstable:aarch64"
272272
CONTAINER_PLATFORM="linux/aarch64"
273273
;;
274274
riscv64gc-unknown-linux-musl)
275-
CONTAINER_IMAGE="ghcr.io/pkgforge/devscripts/alpine-builder:riscv64"
275+
CONTAINER_IMAGE="ghcr.io/pkgforge/devscripts/alpine-slim:riscv64"
276276
CONTAINER_PLATFORM="linux/riscv64"
277277
;;
278278
riscv64gc-unknown-linux-gnu)
279279
CONTAINER_IMAGE="ghcr.io/pkgforge/devscripts/debian-builder-unstable:riscv64"
280280
CONTAINER_PLATFORM="linux/riscv64"
281281
;;
282282
loongarch64-unknown-linux-musl)
283-
CONTAINER_IMAGE="ghcr.io/pkgforge/devscripts/alpine-builder:loongarch64"
283+
CONTAINER_IMAGE="ghcr.io/pkgforge/devscripts/alpine-slim:loongarch64"
284284
CONTAINER_PLATFORM="linux/loong64"
285285
;;
286286
loongarch64-unknown-linux-gnu)
@@ -753,10 +753,7 @@ run_container() {
753753
"--dns=8.8.8.8"
754754
"--ipc=host"
755755
"--log-driver=none"
756-
"--memory-swappiness=1"
757-
"--oom-kill-disable=true"
758756
"--security-opt=seccomp=unconfined"
759-
"--shm-size=2g"
760757
"--ulimit=memlock=-1:-1"
761758
"--ulimit=nofile=1048576:1048576"
762759
"--ulimit=nproc=32768:32768"

0 commit comments

Comments
 (0)