LAB-linuxserver/docker-baseimage-debian
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-baseimage-debian.git synced 2026-02-19 16:57:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20 from linuxserver/bullseye-bump-s6

Browse Source 
Bump s6, Alpine build stage, tidy init, add SBOM/Provenance, etc
This commit is contained in:
Ryan Kuba 2024-12-06 14:45:06 +00:00 committed by GitHub
commit b404d6eb76
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
FROM alpine:3.17 as rootfs-stage
FROM alpine:3 as rootfs-stage
# environment
ENV REL=bullseye
@ -19,7 +19,7 @@ RUN \
mkdir /root-out && \
curl -o \
/rootfs.tar.gz -L \
https://github.com/debuerreotype/docker-debian-artifacts/raw/dist-${ARCH}/${REL}/slim/rootfs.tar.xz && \
https://github.com/debuerreotype/docker-debian-artifacts/raw/refs/heads/dist-${ARCH}/${REL}/slim/oci/blobs/rootfs.tar.gz && \
tar xf \
/rootfs.tar.gz -C \
/root-out && \
@ -27,7 +27,7 @@ RUN \
/root-out/var/log/*
# set version for s6 overlay
ARG S6_OVERLAY_VERSION="3.1.6.2"
ARG S6_OVERLAY_VERSION="3.2.0.2"
ARG S6_OVERLAY_ARCH="x86_64"
# add s6 overlay
@ -38,7 +38,7 @@ 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
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
@ -50,12 +50,14 @@ 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=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods"
ADD --chmod=744 "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=744 "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"

10
Dockerfile.aarch64
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
FROM alpine:3.17 as rootfs-stage
FROM alpine:3 as rootfs-stage
# environment
ENV REL=bullseye
@ -19,7 +19,7 @@ RUN \
mkdir /root-out && \
curl -o \
/rootfs.tar.gz -L \
https://github.com/debuerreotype/docker-debian-artifacts/raw/dist-${ARCH}/${REL}/slim/rootfs.tar.xz && \
https://github.com/debuerreotype/docker-debian-artifacts/raw/refs/heads/dist-${ARCH}/${REL}/slim/oci/blobs/rootfs.tar.gz && \
tar xf \
/rootfs.tar.gz -C \
/root-out && \
@ -27,7 +27,7 @@ RUN \
/root-out/var/log/*
# set version for s6 overlay
ARG S6_OVERLAY_VERSION="3.1.6.2"
ARG S6_OVERLAY_VERSION="3.2.0.2"
ARG S6_OVERLAY_ARCH="aarch64"
# add s6 overlay
@ -38,7 +38,7 @@ 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
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
@ -50,12 +50,14 @@ 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=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods"
ADD --chmod=744 "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=744 "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"

3
jenkins-vars.yml
View File

@ -6,7 +6,8 @@ external_type: os
release_type: prerelease
release_tag: bullseye
ls_branch: bullseye
build_armhf: false
image_sbom: true
image_provenance: true
repo_vars:
- BUILD_VERSION_ARG = 'OS'
- LS_USER = 'linuxserver'

0
root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods → root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-crontab-config
View File

0
root/etc/s6-overlay/s6-rc.d/init-mods/dependencies.d/base → root/etc/s6-overlay/s6-rc.d/init-crontab-config/dependencies.d/init-config
View File

0
root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/base
View File

0
root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-migrations
View File

0
root/etc/s6-overlay/s6-rc.d/init-services/dependencies.d/init-mods-end
View File