Skip to content

Commit da9e00b

Browse files
thespadthespad
authored
Merge pull request #267 from linuxserver/edge-bump-s6
2 parents 17ee18c + b58a039 commit da9e00b

3 files changed

Lines changed: 39 additions & 56 deletions

File tree

‎Dockerfile‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
FROM alpine:3 AS rootfs-stage
44

5-
# environment
6-
ENV ROOTFS=/root-out
7-
ENV REL=edge
8-
ENV ARCH=x86_64
9-
ENV MIRROR=http://dl-cdn.alpinelinux.org/alpine
10-
ENV PACKAGES=alpine-baselayout,\
5+
ARG S6_OVERLAY_VERSION="3.2.1.0"
6+
ARG ROOTFS=/root-out
7+
ARG REL=edge
8+
ARG ARCH=x86_64
9+
ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine
10+
ARG PACKAGES=alpine-baselayout,\
1111
alpine-keys,\
1212
apk-tools,\
1313
busybox,\
@@ -21,23 +21,19 @@ RUN \
2121

2222
# build rootfs
2323
RUN \
24-
mkdir -p "$ROOTFS/etc/apk" && \
24+
mkdir -p "${ROOTFS}/etc/apk" && \
2525
{ \
26-
echo "$MIRROR/$REL/main"; \
27-
echo "$MIRROR/$REL/community"; \
28-
} > "$ROOTFS/etc/apk/repositories" && \
29-
apk --root "$ROOTFS" --no-cache --keys-dir /etc/apk/keys add --arch $ARCH --initdb ${PACKAGES//,/ } && \
26+
echo "${MIRROR}/${REL}/main"; \
27+
echo "${MIRROR}/${REL}/community"; \
28+
} > "${ROOTFS}/etc/apk/repositories" && \
29+
apk --root "${ROOTFS}" --no-cache --keys-dir /etc/apk/keys add --arch ${ARCH} --initdb ${PACKAGES//,/ } && \
3030
sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow
3131

32-
# set version for s6 overlay
33-
ARG S6_OVERLAY_VERSION="3.2.0.2"
34-
ARG S6_OVERLAY_ARCH="x86_64"
35-
3632
# add s6 overlay
3733
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
3834
RUN tar -C /root-out -Jxpf /tmp/s6-overlay-noarch.tar.xz
39-
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz /tmp
40-
RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz
35+
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${ARCH}.tar.xz /tmp
36+
RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${ARCH}.tar.xz
4137

4238
# add s6 optional symlinks
4339
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp

‎Dockerfile.aarch64‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
FROM alpine:3 AS rootfs-stage
44

5-
# environment
6-
ENV ROOTFS=/root-out
7-
ENV REL=edge
8-
ENV ARCH=aarch64
9-
ENV MIRROR=http://dl-cdn.alpinelinux.org/alpine
10-
ENV PACKAGES=alpine-baselayout,\
5+
ARG S6_OVERLAY_VERSION="3.2.1.0"
6+
ARG ROOTFS=/root-out
7+
ARG REL=edge
8+
ARG ARCH=aarch64
9+
ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine
10+
ARG PACKAGES=alpine-baselayout,\
1111
alpine-keys,\
1212
apk-tools,\
1313
busybox,\
@@ -21,23 +21,19 @@ RUN \
2121

2222
# build rootfs
2323
RUN \
24-
mkdir -p "$ROOTFS/etc/apk" && \
24+
mkdir -p "${ROOTFS}/etc/apk" && \
2525
{ \
26-
echo "$MIRROR/$REL/main"; \
27-
echo "$MIRROR/$REL/community"; \
28-
} > "$ROOTFS/etc/apk/repositories" && \
29-
apk --root "$ROOTFS" --no-cache --keys-dir /etc/apk/keys add --arch $ARCH --initdb ${PACKAGES//,/ } && \
26+
echo "${MIRROR}/${REL}/main"; \
27+
echo "${MIRROR}/${REL}/community"; \
28+
} > "${ROOTFS}/etc/apk/repositories" && \
29+
apk --root "${ROOTFS}" --no-cache --keys-dir /etc/apk/keys add --arch ${ARCH} --initdb ${PACKAGES//,/ } && \
3030
sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow
3131

32-
# set version for s6 overlay
33-
ARG S6_OVERLAY_VERSION="3.2.0.2"
34-
ARG S6_OVERLAY_ARCH="aarch64"
35-
3632
# add s6 overlay
3733
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
3834
RUN tar -C /root-out -Jxpf /tmp/s6-overlay-noarch.tar.xz
39-
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz /tmp
40-
RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz
35+
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${ARCH}.tar.xz /tmp
36+
RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${ARCH}.tar.xz
4137

4238
# add s6 optional symlinks
4339
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp
@@ -95,11 +91,6 @@ RUN \
9591
/config \
9692
/defaults \
9793
/lsiopy && \
98-
echo "**** add qemu ****" && \
99-
curl -o \
100-
/usr/bin/qemu-aarch64-static -L \
101-
"https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static" && \
102-
chmod +x /usr/bin/qemu-aarch64-static && \
10394
echo "**** cleanup ****" && \
10495
rm -rf \
10596
/tmp/*

‎Dockerfile.riscv64‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
FROM alpine:3 AS rootfs-stage
44

5-
# environment
6-
ENV ROOTFS=/root-out
7-
ENV REL=edge
8-
ENV ARCH=riscv64
9-
ENV MIRROR=http://dl-cdn.alpinelinux.org/alpine
10-
ENV PACKAGES=alpine-baselayout,\
5+
ARG S6_OVERLAY_VERSION="3.2.1.0"
6+
ARG ROOTFS=/root-out
7+
ARG REL=edge
8+
ARG ARCH=riscv64
9+
ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine
10+
ARG PACKAGES=alpine-baselayout,\
1111
alpine-keys,\
1212
apk-tools,\
1313
busybox,\
@@ -21,23 +21,19 @@ RUN \
2121

2222
# build rootfs
2323
RUN \
24-
mkdir -p "$ROOTFS/etc/apk" && \
24+
mkdir -p "${ROOTFS}/etc/apk" && \
2525
{ \
26-
echo "$MIRROR/$REL/main"; \
27-
echo "$MIRROR/$REL/community"; \
28-
} > "$ROOTFS/etc/apk/repositories" && \
29-
apk --root "$ROOTFS" --no-cache --keys-dir /etc/apk/keys add --arch $ARCH --initdb ${PACKAGES//,/ } && \
26+
echo "${MIRROR}/${REL}/main"; \
27+
echo "${MIRROR}/${REL}/community"; \
28+
} > "${ROOTFS}/etc/apk/repositories" && \
29+
apk --root "${ROOTFS}" --no-cache --keys-dir /etc/apk/keys add --arch ${ARCH} --initdb ${PACKAGES//,/ } && \
3030
sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow
3131

32-
# set version for s6 overlay
33-
ARG S6_OVERLAY_VERSION="3.2.0.2"
34-
ARG S6_OVERLAY_ARCH="riscv64"
35-
3632
# add s6 overlay
3733
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
3834
RUN tar -C /root-out -Jxpf /tmp/s6-overlay-noarch.tar.xz
39-
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz /tmp
40-
RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz
35+
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${ARCH}.tar.xz /tmp
36+
RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${ARCH}.tar.xz
4137

4238
# add s6 optional symlinks
4339
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp

0 commit comments

Comments
 (0)