mirror
/
docker-baseimage-ubuntu
kopia lustrzana https://github.com/linuxserver/docker-baseimage-ubuntu
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #172 from linuxserver/noble-ro 

Add RO hooks (noble)
pull/174/head noble-261c8606-ls10
Adam 2024-07-02 15:15:28 +01:00 zatwierdzone przez GitHub
rodzic c131834dcb 3e3c5ca208
commit c4cd7fafb0
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
4 zmienionych plików z 34 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
Dockerfile
Wyświetl plik

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
FROM alpine:3.20 as rootfs-stage FROM alpine:3.20 AS rootfs-stage
# environment # environment
ENV REL=noble ENV REL=noble
@ -66,9 +66,9 @@ ARG LSIOWN_VERSION="v1"
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="TheLamer" LABEL maintainer="TheLamer"
ADD --chmod=744 "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/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=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=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/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown"
# set environment variables # set environment variables
ARG DEBIAN_FRONTEND="noninteractive" ARG DEBIAN_FRONTEND="noninteractive"

8
Dockerfile.aarch64
Wyświetl plik

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
FROM alpine:3.20 as rootfs-stage FROM alpine:3.20 AS rootfs-stage
# environment # environment
ENV REL=noble ENV REL=noble
@ -66,9 +66,9 @@ ARG LSIOWN_VERSION="v1"
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="TheLamer" LABEL maintainer="TheLamer"
ADD --chmod=744 "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/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=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=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/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown"
# set environment variables # set environment variables
ARG DEBIAN_FRONTEND="noninteractive" ARG DEBIAN_FRONTEND="noninteractive"

27
root/etc/s6-overlay/s6-rc.d/init-adduser/run
Wyświetl plik

@ -4,10 +4,16 @@
PUID=${PUID:-911} PUID=${PUID:-911}
PGID=${PGID:-911} PGID=${PGID:-911}
groupmod -o -g "$PGID" abc if [[ -z ${LSIO_READ_ONLY_FS} ]] && [[ -z ${LSIO_NON_ROOT_USER} ]]; then
usermod -o -u "$PUID" abc groupmod -o -g "$PGID" abc
usermod -o -u "$PUID" abc
fi
cat /etc/s6-overlay/s6-rc.d/init-adduser/branding if { [[ -z ${LSIO_READ_ONLY_FS} ]] && [[ -z ${LSIO_NON_ROOT_USER} ]]; } || [[ ! ${LSIO_FIRST_PARTY} = "true" ]]; then
cat /etc/s6-overlay/s6-rc.d/init-adduser/branding
else
cat /run/branding
fi
if [[ -f /donate.txt ]]; then if [[ -f /donate.txt ]]; then
echo ' echo '
@ -21,10 +27,17 @@ https://www.linuxserver.io/donate/
─────────────────────────────────────── ───────────────────────────────────────
GID/UID GID/UID
───────────────────────────────────────' ───────────────────────────────────────'
if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
echo " echo "
User UID: $(id -u abc) User UID: $(id -u abc)
User GID: $(id -g abc) User GID: $(id -g abc)
───────────────────────────────────────" ───────────────────────────────────────"
else
echo "
User UID: $(stat /run -c %u)
User GID: $(stat /run -c %g)
───────────────────────────────────────"
fi
if [[ -f /build_version ]]; then if [[ -f /build_version ]]; then
cat /build_version cat /build_version
echo ' echo '
@ -32,6 +45,8 @@ if [[ -f /build_version ]]; then
' '
fi fi
lsiown abc:abc /app if [[ -z ${LSIO_READ_ONLY_FS} ]] && [[ -z ${LSIO_NON_ROOT_USER} ]]; then
lsiown abc:abc /config lsiown abc:abc /app
lsiown abc:abc /defaults lsiown abc:abc /config
lsiown abc:abc /defaults
fi

8
root/etc/s6-overlay/s6-rc.d/init-crontab-config/run
Wyświetl plik

@ -2,9 +2,11 @@
# shellcheck shell=bash # shellcheck shell=bash
for cron_user in abc root; do for cron_user in abc root; do
if [[ -f "/etc/crontabs/${cron_user}" ]]; then if [[ -z ${LSIO_READ_ONLY_FS} ]] && [[ -z ${LSIO_NON_ROOT_USER} ]]; then
lsiown "${cron_user}":"${cron_user}" "/etc/crontabs/${cron_user}" if [[ -f "/etc/crontabs/${cron_user}" ]]; then
crontab -u "${cron_user}" "/etc/crontabs/${cron_user}" lsiown "${cron_user}":"${cron_user}" "/etc/crontabs/${cron_user}"
crontab -u "${cron_user}" "/etc/crontabs/${cron_user}"
fi
fi fi
if [[ -f "/defaults/crontabs/${cron_user}" ]]; then if [[ -f "/defaults/crontabs/${cron_user}" ]]; then