pi-farm/docker-baseimage-alpine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix new BUILD_VARIABLES in Dockerfiles
Some checks failed
/ release-and-build (push) Failing after 18s
Details

Browse Source
This commit is contained in:
info@pi-farm.de
2026-02-13 00:32:31 +01:00
parent fcab10d0b5
commit 7fd7d97b92
2 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Dockerfile
View File

@@ -1,13 +1,13 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG BASE_IMAGE=alpine:latest #Fallback alpine:latest ARG BUILD_BASE_IMAGE=alpine:latest #Fallback alpine:latest
FROM ${BASE_IMAGE} AS rootfs-stage FROM ${BUILD_BASE_IMAGE} AS rootfs-stage
ARG APP_VERSION=${BUILD_TAG} ARG BUILD_APP_VERSION
ARG S6_ARCH_amd64 ARG BUILD_S6_ARCH_amd64
ARG S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION} ARG BUILD_S6_OVERLAY_VERSION
ARG ROOTFS=/root-out ARG ROOTFS=/root-out
ARG REL=${APP_VERSION} ARG REL=${BUILD_APP_VERSION}
ARG ARCH=x86_64 ARG ARCH=x86_64
ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine
ARG PACKAGES=alpine-baselayout,\ ARG PACKAGES=alpine-baselayout,\
@@ -29,19 +29,19 @@ RUN \
echo "${MIRROR}/${REL}/main"; \ echo "${MIRROR}/${REL}/main"; \
echo "${MIRROR}/${REL}/community"; \ echo "${MIRROR}/${REL}/community"; \
} > "${ROOTFS}/etc/apk/repositories" && \ } > "${ROOTFS}/etc/apk/repositories" && \
apk --root "${ROOTFS}" --no-cache --keys-dir /etc/apk/keys add --arch ${ARCH} --initdb ${PACKAGES//,/ } && \ apk --root "${ROOTFS}" --no-cache --keys-dir /etc/apk/keys add --arch ${BUILD_S6_ARCH_amd64} --initdb ${PACKAGES//,/ } && \
sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow
# add s6 overlay # add s6 overlay
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
RUN tar -C /root-out -Jxpf /tmp/s6-overlay-noarch.tar.xz 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_ARCH_amd64}.tar.xz /tmp ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-${BUILD_S6_ARCH_amd64}.tar.xz /tmp
RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${S6_ARCH_amd64}.tar.xz RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${S6_ARCH_amd64}.tar.xz
# add s6 optional symlinks # 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 ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_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 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 ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp
RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz
# Runtime stage # Runtime stage
@@ -49,15 +49,16 @@ FROM scratch
COPY --from=rootfs-stage /root-out/ / COPY --from=rootfs-stage /root-out/ /
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG BUILD_APP_VERSION
ARG MODS_VERSION="v3" ARG MODS_VERSION="v3"
ARG PKG_INST_VERSION="v1" ARG PKG_INST_VERSION="v1"
ARG LSIOWN_VERSION="v1" ARG LSIOWN_VERSION="v1"
ARG WITHCONTENV_VERSION="v1" ARG WITHCONTENV_VERSION="v1"
ARG APP_GID ARG BUILD_APP_GID
ARG APP_USER ARG BUILD_APP_USER
LABEL build_version="${MAINTAINER} version: ${APP_VERSION} Build-date:- ${BUILD_DATE}" ARG BUILD_MAINTAINER
LABEL maintainer="${MAINTAINER}" LABEL build_version="${BUILD_MAINTAINER} version: ${BUILD_APP_VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="${BUILD_MAINTAINER}"
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/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/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run"
@@ -90,9 +91,9 @@ RUN \
shadow \ shadow \
tzdata && \ tzdata && \
echo "**** create abc user and make our folders ****" && \ echo "**** create abc user and make our folders ****" && \
groupmod -g ${APP_GID} users && \ groupmod -g ${BUILD_APP_GID} users && \
useradd -u 911 -U -d /config -s /bin/false ${APP_USER} && \ useradd -u 911 -U -d /config -s /bin/false ${BUILD_APP_USER} && \
usermod -G users ${APP_USER} && \ usermod -G users ${BUILD_APP_USER} && \
mkdir -p \ mkdir -p \
/app \ /app \
/config \ /config \

42
Dockerfile.aarch64
View File

@@ -1,13 +1,13 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG BASE_IMAGE=alpine:latest #Fallback alpine:latest ARG BUILD_BASE_IMAGE=alpine:latest #Fallback alpine:latest
FROM ${BASE_IMAGE} AS rootfs-stage FROM ${BUILD_BASE_IMAGE} AS rootfs-stage
ARG APP_VERSION=${BUILD_TAG} ARG BUILD_APP_VERSION
ARG S6_ARCH_aarch64=${S6_ARCH_aarch64} ARG BUILD_S6_ARCH_aarch64
ARG S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION} ARG BUILD_S6_OVERLAY_VERSION
ARG ROOTFS=/root-out ARG ROOTFS=/root-out
ARG REL=${APP_VERSION} ARG REL=${BUILD_APP_VERSION}
ARG ARCH=aarch64 ARG ARCH=aarch64
ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine
ARG PACKAGES=alpine-baselayout,\ ARG PACKAGES=alpine-baselayout,\
@@ -29,36 +29,36 @@ RUN \
echo "${MIRROR}/${REL}/main"; \ echo "${MIRROR}/${REL}/main"; \
echo "${MIRROR}/${REL}/community"; \ echo "${MIRROR}/${REL}/community"; \
} > "${ROOTFS}/etc/apk/repositories" && \ } > "${ROOTFS}/etc/apk/repositories" && \
apk --root "${ROOTFS}" --no-cache --keys-dir /etc/apk/keys add --arch ${ARCH} --initdb ${PACKAGES//,/ } && \ apk --root "${ROOTFS}" --no-cache --keys-dir /etc/apk/keys add --arch ${BUILD_S6_ARCH_aarch64} --initdb ${PACKAGES//,/ } && \
sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow
# add s6 overlay # add s6 overlay
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
RUN tar -C /root-out -Jxpf /tmp/s6-overlay-noarch.tar.xz 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_ARCH_aarch64}.tar.xz /tmp ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH_aarch64}.tar.xz /tmp
RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${S6_ARCH_aarch64}.tar.xz RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${S6_ARCH_aarch64}.tar.xz
# add s6 optional symlinks # 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 ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_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 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 ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp
RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz
# Runtime stage # Runtime stage
FROM scratch FROM scratch
COPY --from=rootfs-stage /root-out/ / COPY --from=rootfs-stage /root-out/ /
ARG MAINTAINER
ARG APP_VERSION
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG BUILD_APP_VERSION
ARG MODS_VERSION="v3" ARG MODS_VERSION="v3"
ARG PKG_INST_VERSION="v1" ARG PKG_INST_VERSION="v1"
ARG LSIOWN_VERSION="v1" ARG LSIOWN_VERSION="v1"
ARG WITHCONTENV_VERSION="v1" ARG WITHCONTENV_VERSION="v1"
ARG APP_GID ARG BUILD_APP_GID
ARG APP_USER ARG BUILD_APP_USER
LABEL build_version="${MAINTAINER} version: ${VERSION} Build-date:- ${BUILD_DATE}" ARG BUILD_MAINTAINER
LABEL maintainer="${MAINTAINER}" LABEL build_version="${BUILD_MAINTAINER} version: ${BUILD_APP_VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="${BUILD_MAINTAINER}"
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/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/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run"
@@ -91,9 +91,9 @@ RUN \
shadow \ shadow \
tzdata && \ tzdata && \
echo "**** create abc user and make our folders ****" && \ echo "**** create abc user and make our folders ****" && \
groupmod -g ${APP_GID} users && \ groupmod -g ${BUILD_APP_GID} users && \
useradd -u 911 -U -d /config -s /bin/false ${APP_USER} && \ useradd -u 911 -U -d /config -s /bin/false ${BUILD_APP_USER} && \
usermod -G users ${APP_USER} && \ usermod -G users ${BUILD_APP_USER} && \
mkdir -p \ mkdir -p \
/app \ /app \
/config \ /config \