This commit is contained in:
@@ -48,7 +48,7 @@ jobs:
|
|||||||
docker push git.pi-farm.de/pi-farm/docker-baseimage-alpine:${VERSION}
|
docker push git.pi-farm.de/pi-farm/docker-baseimage-alpine:${VERSION}
|
||||||
|
|
||||||
|
|
||||||
- name: Build & push multi-arch image
|
- name: Build & push arm64 with buildx builder
|
||||||
run: |
|
run: |
|
||||||
docker buildx build \
|
docker buildx build \
|
||||||
--platform linux/arm64 \
|
--platform linux/arm64 \
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
FROM alpine:3.21 AS rootfs-stage
|
FROM alpine:3.23 AS rootfs-stage
|
||||||
|
|
||||||
ARG S6_OVERLAY_VERSION="3.2.2.0"
|
ARG S6_OVERLAY_VERSION="3.2.2.0"
|
||||||
ARG ROOTFS=/root-out
|
ARG ROOTFS=/root-out
|
||||||
ARG REL=v3.21
|
ARG REL=v3.23
|
||||||
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,\
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
FROM alpine:3.21 AS rootfs-stage
|
FROM alpine:3.23 AS rootfs-stage
|
||||||
|
|
||||||
ARG S6_OVERLAY_VERSION="3.2.2.0"
|
ARG S6_OVERLAY_VERSION="3.2.2.0"
|
||||||
ARG ROOTFS=/root-out
|
ARG ROOTFS=/root-out
|
||||||
ARG REL=v3.21
|
ARG REL=v3.23
|
||||||
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,\
|
||||||
@@ -22,17 +22,12 @@ RUN \
|
|||||||
# build rootfs
|
# build rootfs
|
||||||
RUN \
|
RUN \
|
||||||
mkdir -p "${ROOTFS}/etc/apk" && \
|
mkdir -p "${ROOTFS}/etc/apk" && \
|
||||||
cp -a /etc/apk/keys "${ROOTFS}/etc/apk/" && \
|
|
||||||
{ \
|
{ \
|
||||||
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}" \
|
apk --root "${ROOTFS}" --no-cache --keys-dir /etc/apk/keys add --arch ${ARCH} --initdb ${PACKAGES//,/ } && \
|
||||||
--no-cache \
|
sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow
|
||||||
--arch ${ARCH} \
|
|
||||||
--initdb \
|
|
||||||
add ${PACKAGES//,/ } && \
|
|
||||||
sed -i -e 's/^root::/root:!:/' "${ROOTFS}/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
|
||||||
|
|||||||
Reference in New Issue
Block a user