This commit is contained in:
@@ -4,10 +4,11 @@ ARG BASE_IMAGE=alpine:latest #Fallback alpine:latest
|
|||||||
FROM ${BASE_IMAGE} AS rootfs-stage
|
FROM ${BASE_IMAGE} AS rootfs-stage
|
||||||
|
|
||||||
ARG APP_VERSION=${BUILD_TAG}
|
ARG APP_VERSION=${BUILD_TAG}
|
||||||
|
ARG S6_ARCH_amd64
|
||||||
ARG S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION}
|
ARG S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION}
|
||||||
ARG ROOTFS=/root-out
|
ARG ROOTFS=/root-out
|
||||||
ARG REL=${APP_VERSION}
|
ARG REL=${APP_VERSION}
|
||||||
ARG ARCH=x86_64
|
ARG ALPINE_ARCH=${ALPINE_ARCH_AMD64}
|
||||||
ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine
|
ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine
|
||||||
ARG PACKAGES=alpine-baselayout,\
|
ARG PACKAGES=alpine-baselayout,\
|
||||||
alpine-keys,\
|
alpine-keys,\
|
||||||
@@ -28,14 +29,14 @@ 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 ${ALPINE_ARCH} --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${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-${ARCH}.tar.xz /tmp
|
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH_amd64}.tar.xz /tmp
|
||||||
RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${ARCH}.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${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp
|
||||||
|
|||||||
@@ -4,10 +4,11 @@ ARG BASE_IMAGE=alpine:latest #Fallback alpine:latest
|
|||||||
FROM ${BASE_IMAGE} AS rootfs-stage
|
FROM ${BASE_IMAGE} AS rootfs-stage
|
||||||
|
|
||||||
ARG APP_VERSION=${BUILD_TAG}
|
ARG APP_VERSION=${BUILD_TAG}
|
||||||
|
ARG S6_ARCH_aarch64=${S6_ARCH_aarch64}
|
||||||
ARG S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION}
|
ARG S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION}
|
||||||
ARG ROOTFS=/root-out
|
ARG ROOTFS=/root-out
|
||||||
ARG REL=${APP_VERSION}
|
ARG REL=${APP_VERSION}
|
||||||
ARG ARCH=aarch64
|
ARG ALPINE_ARCH=${ALPINE_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,\
|
||||||
alpine-keys,\
|
alpine-keys,\
|
||||||
@@ -28,14 +29,14 @@ 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 ${ALPINE_ARCH} --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${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-${ARCH}.tar.xz /tmp
|
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH_aarch64}.tar.xz /tmp
|
||||||
RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${ARCH}.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${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp
|
||||||
|
|||||||
@@ -6,6 +6,10 @@ BASE_IMAGE=alpine:${BUILD_TAG}
|
|||||||
# Examples for BASE_IMAGE
|
# Examples for BASE_IMAGE
|
||||||
#alpine:${BUILD_TAG}
|
#alpine:${BUILD_TAG}
|
||||||
#git.pi-farm.de/pi-farm/docker-baseimage-alpine:v${BUILD_TAG}
|
#git.pi-farm.de/pi-farm/docker-baseimage-alpine:v${BUILD_TAG}
|
||||||
|
ALPINE_ARCH_AMD64=amd64
|
||||||
|
ALPINE_ARCH_AARCH64=aarch64
|
||||||
|
S6_ARCH_amd64=x86_64
|
||||||
|
S6_ARCH_aarch64=aarch64
|
||||||
S6_OVERLAY_VERSION=3.2.0.2
|
S6_OVERLAY_VERSION=3.2.0.2
|
||||||
MAINTAINER=pi-farm
|
MAINTAINER=pi-farm
|
||||||
TZ=Europe/Berlin
|
TZ=Europe/Berlin
|
||||||
|
|||||||
Reference in New Issue
Block a user