diff --git a/Dockerfile.riscv64 b/Dockerfile.riscv64 deleted file mode 100644 index 58bbda3..0000000 --- a/Dockerfile.riscv64 +++ /dev/null @@ -1,162 +0,0 @@ -# syntax=docker/dockerfile:1 - -FROM alpine:3 AS rootfs-stage - -# environment -ENV ARCH=riscv64 -ENV TAG=oci-resolute-26.04 - -# install packages -RUN \ - apk add --no-cache \ - bash \ - curl \ - git \ - jq \ - tzdata \ - xz - -# grab base tarball -RUN \ - git clone --depth=1 https://git.launchpad.net/cloud-images/+oci/ubuntu-base -b ${TAG} /build && \ - cd /build/oci && \ - DIGEST=$(jq -r '.manifests[0].digest[7:]' < index.json) && \ - cd /build/oci/blobs/sha256 && \ - if jq -e '.layers // empty' < "${DIGEST}" >/dev/null 2>&1; then \ - TARBALL=$(jq -r '.layers[0].digest[7:]' < ${DIGEST}); \ - else \ - MULTIDIGEST=$(jq -r ".manifests[] | select(.platform.architecture == \"${ARCH}\") | .digest[7:]" < ${DIGEST}) && \ - TARBALL=$(jq -r '.layers[0].digest[7:]' < ${MULTIDIGEST}); \ - fi && \ - mkdir /root-out && \ - tar xf \ - ${TARBALL} -C \ - /root-out && \ - rm -rf \ - /root-out/var/log/* \ - /root-out/home/ubuntu \ - /root-out/root/{.ssh,.bashrc,.profile} \ - /build - -# set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.2.2.0" -ARG S6_OVERLAY_ARCH="riscv64" - -# add s6 overlay -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-noarch.tar.xz -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz - -# add s6 optional symlinks -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz && unlink /root-out/usr/bin/with-contenv -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" -ARG PKG_INST_VERSION="v1" -ARG LSIOWN_VERSION="v1" -ARG WITHCONTENV_VERSION="v1" -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="TheLamer" - -ADD --chmod=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods" -ADD --chmod=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run" -ADD --chmod=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown" -ADD --chmod=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/with-contenv.${WITHCONTENV_VERSION}" "/usr/bin/with-contenv" - -# set environment variables -ARG DEBIAN_FRONTEND="noninteractive" -ENV HOME="/root" \ - LANGUAGE="en_US.UTF-8" \ - LANG="en_US.UTF-8" \ - TERM="xterm" \ - S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ - S6_VERBOSITY=1 \ - S6_STAGE2_HOOK=/docker-mods \ - VIRTUAL_ENV=/lsiopy \ - PATH="/lsiopy/bin:$PATH" - -# copy sources -COPY sources.list.riscv /etc/apt/sources.list - -RUN \ - echo "**** Ripped from Ubuntu Docker Logic ****" && \ - rm -f /etc/apt/sources.list.d/ubuntu.sources && \ - set -xe && \ - echo '#!/bin/sh' \ - > /usr/sbin/policy-rc.d && \ - echo 'exit 101' \ - >> /usr/sbin/policy-rc.d && \ - chmod +x \ - /usr/sbin/policy-rc.d && \ - dpkg-divert --local --rename --add /sbin/initctl && \ - cp -a \ - /usr/sbin/policy-rc.d \ - /sbin/initctl && \ - sed -i \ - 's/^exit.*/exit 0/' \ - /sbin/initctl && \ - echo 'force-unsafe-io' \ - > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup && \ - echo 'DPkg::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \ - > /etc/apt/apt.conf.d/docker-clean && \ - echo 'APT::Update::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \ - >> /etc/apt/apt.conf.d/docker-clean && \ - echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' \ - >> /etc/apt/apt.conf.d/docker-clean && \ - echo 'Acquire::Languages "none";' \ - > /etc/apt/apt.conf.d/docker-no-languages && \ - echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' \ - > /etc/apt/apt.conf.d/docker-gzip-indexes && \ - echo 'Apt::AutoRemove::SuggestsImportant "false";' \ - > /etc/apt/apt.conf.d/docker-autoremove-suggests && \ - mkdir -p /run/systemd && \ - echo 'docker' \ - > /run/systemd/container && \ - echo "**** install apt-utils and locales ****" && \ - apt-get update && \ - apt-get upgrade -y && \ - apt-get install -y \ - apt-utils \ - locales && \ - echo "**** install packages ****" && \ - apt-get install -y \ - catatonit \ - cron \ - curl \ - gnupg \ - jq \ - netcat-openbsd \ - systemd-standalone-sysusers \ - tzdata && \ - echo "**** generate locale ****" && \ - locale-gen en_US.UTF-8 && \ - 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 \ - /lsiopy && \ - echo "**** cleanup ****" && \ - userdel ubuntu && \ - apt-get autoremove && \ - apt-get clean && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* \ - /var/log/* - -# add local files -COPY root/ / - -ENTRYPOINT ["/init"] diff --git a/jenkins-vars.yml b/jenkins-vars.yml index cfa2e79..6cba045 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,7 +6,6 @@ external_type: os release_type: prerelease release_tag: resolute ls_branch: resolute -build_riscv64: false repo_vars: - BUILD_VERSION_ARG = 'OS' - LS_USER = 'linuxserver' diff --git a/sources.list.riscv b/sources.list.riscv deleted file mode 100644 index c402cd8..0000000 --- a/sources.list.riscv +++ /dev/null @@ -1,12 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ resolute main restricted multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ resolute main restricted multiverse -deb http://ports.ubuntu.com/ubuntu-ports/ resolute-updates main restricted multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ resolute-updates main restricted multiverse -deb http://ports.ubuntu.com/ubuntu-ports/ resolute universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ resolute universe -deb http://ports.ubuntu.com/ubuntu-ports/ resolute-updates universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ resolute-updates universe -deb http://ports.ubuntu.com/ubuntu-ports/ resolute-security main restricted multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ resolute-security main restricted multiverse -deb http://ports.ubuntu.com/ubuntu-ports/ resolute-security universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ resolute-security universe