Compare commits

..

2 Commits

Author SHA1 Message Date
Lance Vick a876992489
remove remaining REGISTRY references in Containerfiles 2024-02-05 04:35:14 -08:00
Lance Vick 53d954a9f8
fix bootstrap image names 2024-02-05 03:11:28 -08:00
11 changed files with 56 additions and 125 deletions

View File

@ -44,7 +44,7 @@ BUILD_KERNELS=False" \
RUN touch /rootfs/steps/lwext4-1.0.0-lb1/files/fiwix-file-list.txt
FROM scratch as build
COPY --from=stage0 / .
COPY --from=stagex/stage0 / .
COPY --from=config /rootfs .
ENV ARCH_DIR=x86
ENV ARCH=x86

View File

@ -165,7 +165,7 @@ RUN set -eux; \
FROM build as install
WORKDIR ${HOME}
USER 0:0
COPY --from=stage1 . /rootfs/
COPY --from=stagex/stage1 . /rootfs/
RUN set -eux; \
rm /rootfs/lib; \
env -C build-musl make DESTDIR=/rootfs/${TARGET} install; \

View File

@ -1,25 +1,15 @@
ARG REGISTRY=local
FROM ${REGISTRY}/busybox as busybox
FROM ${REGISTRY}/gcc as gcc
FROM ${REGISTRY}/binutils as binutils
FROM ${REGISTRY}/musl as musl
FROM ${REGISTRY}/make as make
FROM ${REGISTRY}/autoconf as autoconf
FROM ${REGISTRY}/automake as automake
FROM ${REGISTRY}/m4 as m4
FROM busybox as base
FROM stagex/busybox as base
ENV VERSION=1.5.0
ENV SRC_FILE=${VERSION}.tar.gz
ENV SRC_SITE=https://github.com/argp-standalone/argp-standalone/archive/refs/tags/${SRC_FILE}
ENV SRC_HASH=c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6
COPY --from=gcc . /
COPY --from=binutils . /
COPY --from=make . /
COPY --from=musl . /
COPY --from=autoconf . /
COPY --from=automake . /
COPY --from=m4 . /
COPY --from=stagex/gcc . /
COPY --from=stagex/binutils . /
COPY --from=stagex/make . /
COPY --from=stagex/musl . /
COPY --from=stagex/autoconf . /
COPY --from=stagex/automake . /
COPY --from=stagex/m4 . /
FROM base as fetch
RUN wget ${SRC_SITE}

View File

@ -1,11 +1,4 @@
ARG REGISTRY=local
FROM ${REGISTRY}/gcc:latest as gcc
FROM ${REGISTRY}/binutils:latest as binutils
FROM ${REGISTRY}/musl:latest as musl
FROM ${REGISTRY}/make:latest as make
FROM ${REGISTRY}/busybox:latest as busybox
FROM busybox as base
FROM stagex/busybox as base
ENV SRC_SITE https://ftp.gnu.org/gnu/bison
ENV SRC_VERSION 3.8.2
ENV SRC_HASH 06c9e13bdf7eb24d4ceb6b59205a4f67c2c7e7213119644430fe82fbd14a0abb
@ -19,10 +12,10 @@ RUN set -eux; \
FROM fetch as build
RUN tar -xf ${SRC_FILE}
WORKDIR bison-${SRC_VERSION}
COPY --from=gcc . /
COPY --from=binutils . /
COPY --from=make . /
COPY --from=musl . /
COPY --from=stagex/gcc . /
COPY --from=stagex/binutils . /
COPY --from=stagex/make . /
COPY --from=stagex/musl . /
ENV M4=/usr/bin/m4
RUN set -eux; \
./configure \

View File

@ -1,17 +1,4 @@
ARG REGISTRY=local
from ${REGISTRY}/binutils as binutils
from ${REGISTRY}/m4 as m4
from ${REGISTRY}/gcc as gcc
from ${REGISTRY}/musl as musl
from ${REGISTRY}/make as make
from ${REGISTRY}/libtool as libtool
from ${REGISTRY}/autoconf as autoconf
from ${REGISTRY}/automake as automake
from ${REGISTRY}/gettext as gettext
from ${REGISTRY}/bison as bison
from ${REGISTRY}/busybox as busybox
FROM busybox as base
FROM stagex/busybox as base
ENV VERSION=2.6.4
ENV SRC_SITE=https://github.com/westes/flex/releases/download/v${VERSION}/flex-${VERSION}.tar.gz
ENV SRC_HASH=e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995
@ -25,16 +12,16 @@ RUN set -eux; \
FROM fetch as build
RUN tar -xzf ${SRC_FILE}
WORKDIR flex-${VERSION}
COPY --from=gcc . /
COPY --from=binutils . /
COPY --from=make . /
COPY --from=m4 . /
COPY --from=libtool . /
COPY --from=autoconf . /
COPY --from=automake . /
COPY --from=bison . /
COPY --from=gettext . /
COPY --from=musl . /
COPY --from=stagex/gcc . /
COPY --from=stagex/binutils . /
COPY --from=stagex/make . /
COPY --from=stagex/m4 . /
COPY --from=stagex/libtool . /
COPY --from=stagex/autoconf . /
COPY --from=stagex/automake . /
COPY --from=stagex/bison . /
COPY --from=stagex/gettext . /
COPY --from=stagex/musl . /
RUN set -eux; \
./autogen.sh; \

View File

@ -1,11 +1,4 @@
ARG REGISTRY=local
FROM ${REGISTRY}/gcc:latest as gcc
FROM ${REGISTRY}/binutils:latest as binutils
FROM ${REGISTRY}/musl:latest as musl
FROM ${REGISTRY}/make:latest as make
FROM ${REGISTRY}/busybox:latest as busybox
FROM busybox as base
FROM stagex/busybox as base
ENV SRC_SITE https://ftp.gnu.org/gnu/gettext
ENV SRC_VERSION 0.22.4
ENV SRC_HASH c1e0bb2a4427a9024390c662cd532d664c4b36b8ff444ed5e54b115fdb7a1aea
@ -19,10 +12,10 @@ RUN set -eux; \
FROM fetch as build
RUN tar -xf ${SRC_FILE}
WORKDIR gettext-${SRC_VERSION}
COPY --from=gcc . /
COPY --from=binutils . /
COPY --from=make . /
COPY --from=musl . /
COPY --from=stagex/gcc . /
COPY --from=stagex/binutils . /
COPY --from=stagex/make . /
COPY --from=stagex/musl . /
ENV M4=/usr/bin/m4
RUN set -eux; \
./configure \

View File

@ -1,16 +1,11 @@
ARG REGISTRY=local
FROM ${REGISTRY}/python as python
FROM ${REGISTRY}/py-setuptools as py-setuptools
FROM ${REGISTRY}/zlib as zlib
FROM busybox as base
FROM stagex/busybox as base
ENV VERSION=1.3.1
ENV SRC_FILE=meson-${VERSION}.tar.gz
ENV SRC_SITE=https://github.com/mesonbuild/meson/releases/download/${VERSION}/${SRC_FILE}
ENV SRC_HASH=6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7
COPY --from=python . /
COPY --from=py-setuptools . /
COPY --from=zlib . /
COPY --from=stagex/python . /
COPY --from=stagex/py-setuptools . /
COPY --from=stagex/zlib . /
FROM base as fetch
RUN set -eux; \

View File

@ -1,29 +1,17 @@
ARG REGISTRY=local
FROM ${REGISTRY}/busybox as busybox
FROM ${REGISTRY}/gcc as gcc
FROM ${REGISTRY}/binutils as binutils
FROM ${REGISTRY}/musl as musl
FROM ${REGISTRY}/make as make
FROM ${REGISTRY}/autoconf as autoconf
FROM ${REGISTRY}/automake as automake
FROM ${REGISTRY}/libtool as libtool
FROM ${REGISTRY}/m4 as m4
FROM ${REGISTRY}/pkgconf as pkgconf
FROM busybox as base
FROM stagex/busybox as base
ENV VERSION=1.2.7
ENV SRC_FILE=v${VERSION}.tar.gz
ENV SRC_SITE=https://github.com/void-linux/musl-fts/archive/refs/tags/${SRC_FILE}
ENV SRC_HASH=49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6
COPY --from=gcc . /
COPY --from=binutils . /
COPY --from=make . /
COPY --from=musl . /
COPY --from=autoconf . /
COPY --from=automake . /
COPY --from=libtool . /
COPY --from=pkgconf . /
COPY --from=m4 . /
COPY --from=stagex/gcc . /
COPY --from=stagex/binutils . /
COPY --from=stagex/make . /
COPY --from=stagex/musl . /
COPY --from=stagex/autoconf . /
COPY --from=stagex/automake . /
COPY --from=stagex/libtool . /
COPY --from=stagex/pkgconf . /
COPY --from=stagex/m4 . /
FROM base as fetch
RUN wget ${SRC_SITE}

View File

@ -1,29 +1,17 @@
ARG REGISTRY=local
FROM ${REGISTRY}/busybox as busybox
FROM ${REGISTRY}/gcc as gcc
FROM ${REGISTRY}/binutils as binutils
FROM ${REGISTRY}/musl as musl
FROM ${REGISTRY}/make as make
FROM ${REGISTRY}/autoconf as autoconf
FROM ${REGISTRY}/automake as automake
FROM ${REGISTRY}/libtool as libtool
FROM ${REGISTRY}/m4 as m4
FROM ${REGISTRY}/pkgconf as pkgconf
FROM busybox as base
FROM stagex/busybox as base
ENV VERSION=1.2.3
ENV SRC_FILE=v${VERSION}.tar.gz
ENV SRC_SITE=https://github.com/void-linux/musl-obstack/archive/refs/tags/${SRC_FILE}
ENV SRC_HASH=9ffb3479b15df0170eba4480e51723c3961dbe0b461ec289744622db03a69395
COPY --from=gcc . /
COPY --from=binutils . /
COPY --from=make . /
COPY --from=musl . /
COPY --from=autoconf . /
COPY --from=automake . /
COPY --from=libtool . /
COPY --from=pkgconf . /
COPY --from=m4 . /
COPY --from=stagex/gcc . /
COPY --from=stagex/binutils . /
COPY --from=stagex/make . /
COPY --from=stagex/musl . /
COPY --from=stagex/autoconf . /
COPY --from=stagex/automake . /
COPY --from=stagex/libtool . /
COPY --from=stagex/pkgconf . /
COPY --from=stagex/m4 . /
FROM base as fetch
RUN wget ${SRC_SITE}

View File

@ -8,7 +8,6 @@ COPY --from=stagex/python . /
COPY --from=stagex/musl . /
COPY --from=stagex/gcc . /
COPY --from=stagex/openssl . /
FROM ${REGISTRY}/busybox:latest as busybox
FROM base as fetch
RUN wget --no-check-certificate ${SRC_SITE}/v${SRC_VERSION}.tar.gz

View File

@ -29,8 +29,6 @@ ENV SRC_HASH_1_71_0=a667e4abdc5588ebfea35c381e319d840ffbf8d2dbfb7977173057364203
ENV SRC_HASH_1_72_0=ea9d61bbb51d76b6ea681156f69f0e0596b59722f04414b01c6e100b4b5be3a1
ENV SRC_HASH_1_73_0=96d62e6d1f2d21df7ac8acb3b9882411f9e7c7036173f7f2ede9e1f1f6b1bb3a
ENV SRC_HASH_1_74_0=882b584bc321c5dcfe77cdaa69f277906b936255ef7808fcd5c7492925cf1049
ARG REGISTRY
ENV REGISTRY=${REGISTRY}
ARG VERSION
ENV VERSION=${VERSION}
ARG BUILD_VERSION
@ -109,7 +107,7 @@ RUN wget --no-check-certificate ${SRC_SITE}/rustc-${VERSION}-src.tar.gz
RUN echo "$(printenv SRC_HASH_${VERSION//./_}) rustc-${VERSION}-src.tar.gz"
RUN echo "$(printenv SRC_HASH_${VERSION//./_}) rustc-${VERSION}-src.tar.gz" | sha256sum -c
FROM ${REGISTRY}/rust:${BUILD_VERSION} as rust
FROM stagex/rust:${BUILD_VERSION} as rust
FROM fetch as build
RUN tar -xzf rustc-${VERSION}-src.tar.gz
WORKDIR rustc-${VERSION}-src