diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 7eac62e..4c8880a 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -2,29 +2,12 @@ FROM alpine:3.16 as rootfs-stage -# environment -ENV ARCH=armhfp -ARG FEDORA_VERSION - # install packages RUN \ apk add --no-cache \ bash \ curl \ - git \ - jq \ - tar \ - tzdata \ - xz - -# grab tarball root -RUN \ - mkdir /root-out && \ - git clone --depth 1 -b ${FEDORA_VERSION} https://github.com/fedora-cloud/docker-brew-fedora.git && \ - tar xf \ - docker-brew-fedora/${ARCH}/fedora-${FEDORA_VERSION}*.tar.xz -C \ - /root-out && \ - sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow + tzdata # set version for s6 overlay ARG S6_OVERLAY_VERSION="3.1.2.1" @@ -42,53 +25,7 @@ RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz -# Runtime stage -FROM scratch -COPY --from=rootfs-stage /root-out/ / -ARG BUILD_DATE -ARG VERSION -ARG MODS_VERSION="v3" -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="TheLamer" - -ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods" - -# environment variables -ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ -HOME="/root" \ -TERM="xterm" \ -S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ -S6_VERBOSITY=1 \ -S6_STAGE2_HOOK=/docker-mods - -RUN \ - echo "**** install base packages ****" && \ - dnf -y --forcearch armv7hl --setopt=install_weak_deps=False --best install \ - ca-certificates \ - coreutils \ - curl \ - findutils \ - hostname \ - jq \ - netcat \ - procps \ - shadow \ - tzdata \ - which && \ - echo "**** create abc user and make our folders ****" && \ - useradd -u 911 -U -d /config -s /bin/false abc && \ - usermod -G users abc && \ - mkdir -p \ - /app \ - /config \ - /defaults && \ - echo "**** cleanup ****" && \ - dnf autoremove -y && \ - dnf clean all && \ - rm -rf \ - /tmp/* - # add local files -COPY root/ / +COPY root-armhf/ / ENTRYPOINT ["/init"] diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/init-os/dependencies.d/legacy-services b/root-armhf/etc/s6-overlay/s6-rc.d/init-os/dependencies.d/legacy-services new file mode 100644 index 0000000..e69de29 diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/init-os/run b/root-armhf/etc/s6-overlay/s6-rc.d/init-os/run new file mode 100755 index 0000000..e8a0b84 --- /dev/null +++ b/root-armhf/etc/s6-overlay/s6-rc.d/init-os/run @@ -0,0 +1,14 @@ +#!/usr/bin/with-contenv bash + +cat <<-EOF + ******************************************************** + ******************************************************** + * * + * !!!! * + * This Fedora baseimage does not support * + * 32 bit ARM due to lack of available OS packages * + * * + * * + ******************************************************** + ******************************************************** +EOF diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/init-os/type b/root-armhf/etc/s6-overlay/s6-rc.d/init-os/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root-armhf/etc/s6-overlay/s6-rc.d/init-os/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/init-os/up b/root-armhf/etc/s6-overlay/s6-rc.d/init-os/up new file mode 100644 index 0000000..65487fb --- /dev/null +++ b/root-armhf/etc/s6-overlay/s6-rc.d/init-os/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-os/run \ No newline at end of file diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/user2/contents.d/init-os b/root-armhf/etc/s6-overlay/s6-rc.d/user2/contents.d/init-os new file mode 100644 index 0000000..e69de29