Merge remote-tracking branch 'origin/lance/remove-node' into staging

This commit is contained in:
ryan 2024-03-13 22:18:23 -04:00
commit e2c599ea99
No known key found for this signature in database
GPG key ID: 8E401478A3FBEF72
2 changed files with 7 additions and 63 deletions

View file

@ -1,43 +0,0 @@
FROM scratch as base
ENV VERSION=20.11.1
ENV SRC_HASH=4af1ba6ea848cc05908b8a62b02fb27684dd52b2a7988ee82b0cfa72deb90b94
ENV SRC_FILE=node-v${VERSION}.tar.gz
ENV SRC_SITE=https://nodejs.org/dist/v${VERSION}/${SRC_FILE}
FROM base as fetch
ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .
FROM fetch as build
COPY --from=stagex/busybox . /
COPY --from=stagex/gcc . /
COPY --from=stagex/binutils . /
COPY --from=stagex/make . /
COPY --from=stagex/musl . /
COPY --from=stagex/openssl . /
COPY --from=stagex/python . /
COPY --from=stagex/bzip2 . /
COPY --from=stagex/ninja . /
COPY --from=stagex/zlib . /
COPY --from=stagex/linux-headers . /
RUN tar -xf ${SRC_FILE}
WORKDIR node-v${VERSION}
RUN --network=none <<-EOF
set -eux
python configure.py \
--prefix=/usr \
--ninja \
--shared-openssl \
--shared-zlib \
--openssl-use-def-ca-store
make BUILDTYPE=Release
EOF
FROM build as install
RUN --network=none <<-EOF
set -eux
make DESTDIR=/rootfs install
find /rootfs -exec touch -hcd "@0" "{}" +
EOF
FROM stagex/filesystem as package
COPY --from=install /rootfs/. /

View file

@ -529,13 +529,18 @@ out/gzip/index.json: \
iputils: out/iputils/index.json
out/iputils/index.json: \
packages/iputils/Containerfile \
out/filesystem/index.json \
out/binutils/index.json \
out/busybox/index.json \
out/filesystem/index.json \
out/gcc/index.json \
out/libcap/index.json \
out/libxslt/index.json \
out/linux-headers/index.json \
out/meson/index.json \
out/musl/index.json \
out/gcc/index.json
out/ninja/index.json \
out/python/index.json \
out/zlib/index.json
$(call build,iputils)
.PHONY: keyfork
@ -1013,24 +1018,6 @@ out/ninja/index.json: \
out/python/index.json
$(call build,ninja)
.PHONY: nodejs
nodejs: out/nodejs/index.json
out/nodejs/index.json: \
packages/nodejs/Containerfile \
out/binutils/index.json \
out/busybox/index.json \
out/bzip2/index.json \
out/filesystem/index.json \
out/gcc/index.json \
out/linux-headers/index.json \
out/make/index.json \
out/musl/index.json \
out/ninja/index.json \
out/openssl/index.json \
out/python/index.json \
out/zlib/index.json
$(call build,nodejs)
.PHONY: npth
npth: out/npth/index.json
out/npth/index.json: \