fix new BUILD_VARIABLES in Dockerfiles
Some checks failed
/ release-and-build (push) Failing after 18s
Some checks failed
/ release-and-build (push) Failing after 18s
This commit is contained in:
39
Dockerfile
39
Dockerfile
@@ -1,13 +1,13 @@
|
||||
# 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 S6_ARCH_amd64
|
||||
ARG S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION}
|
||||
ARG BUILD_APP_VERSION
|
||||
ARG BUILD_S6_ARCH_amd64
|
||||
ARG BUILD_S6_OVERLAY_VERSION
|
||||
ARG ROOTFS=/root-out
|
||||
ARG REL=${APP_VERSION}
|
||||
ARG REL=${BUILD_APP_VERSION}
|
||||
ARG ARCH=x86_64
|
||||
ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine
|
||||
ARG PACKAGES=alpine-baselayout,\
|
||||
@@ -29,19 +29,19 @@ RUN \
|
||||
echo "${MIRROR}/${REL}/main"; \
|
||||
echo "${MIRROR}/${REL}/community"; \
|
||||
} > "${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
|
||||
|
||||
# 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
|
||||
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
|
||||
|
||||
# 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
|
||||
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
|
||||
|
||||
# Runtime stage
|
||||
@@ -49,15 +49,16 @@ FROM scratch
|
||||
COPY --from=rootfs-stage /root-out/ /
|
||||
|
||||
ARG BUILD_DATE
|
||||
ARG VERSION
|
||||
ARG BUILD_APP_VERSION
|
||||
ARG MODS_VERSION="v3"
|
||||
ARG PKG_INST_VERSION="v1"
|
||||
ARG LSIOWN_VERSION="v1"
|
||||
ARG WITHCONTENV_VERSION="v1"
|
||||
ARG APP_GID
|
||||
ARG APP_USER
|
||||
LABEL build_version="${MAINTAINER} version: ${APP_VERSION} Build-date:- ${BUILD_DATE}"
|
||||
LABEL maintainer="${MAINTAINER}"
|
||||
ARG BUILD_APP_GID
|
||||
ARG BUILD_APP_USER
|
||||
ARG BUILD_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/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run"
|
||||
@@ -90,9 +91,9 @@ RUN \
|
||||
shadow \
|
||||
tzdata && \
|
||||
echo "**** create abc user and make our folders ****" && \
|
||||
groupmod -g ${APP_GID} users && \
|
||||
useradd -u 911 -U -d /config -s /bin/false ${APP_USER} && \
|
||||
usermod -G users ${APP_USER} && \
|
||||
groupmod -g ${BUILD_APP_GID} users && \
|
||||
useradd -u 911 -U -d /config -s /bin/false ${BUILD_APP_USER} && \
|
||||
usermod -G users ${BUILD_APP_USER} && \
|
||||
mkdir -p \
|
||||
/app \
|
||||
/config \
|
||||
|
||||
Reference in New Issue
Block a user