meatbag/baseimage-alpine
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #184 from linuxserver/edge-s6bump

Browse source
This commit is contained in:
Adam 2023-05-15 21:23:43 +01:00 committed by GitHub
parent 46265f64df ce069f2039
commit 2ab413b631
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Dockerfile
View file

@ -30,7 +30,7 @@ RUN \
sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow
# set version for s6 overlay # set version for s6 overlay
ARG S6_OVERLAY_VERSION="3.1.2.1" ARG S6_OVERLAY_VERSION="3.1.5.0"
ARG S6_OVERLAY_ARCH="x86_64" ARG S6_OVERLAY_ARCH="x86_64"
# add s6 overlay # add s6 overlay
@ -62,7 +62,9 @@ HOME="/root" \
TERM="xterm" \ TERM="xterm" \
S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \
S6_VERBOSITY=1 \ S6_VERBOSITY=1 \
S6_STAGE2_HOOK=/docker-mods S6_STAGE2_HOOK=/docker-mods \
VIRTUAL_ENV=/lsiopy \
PATH="/lsiopy/bin:$PATH"
RUN \ RUN \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \
@ -83,7 +85,8 @@ RUN \
mkdir -p \ mkdir -p \
/app \ /app \
/config \ /config \
/defaults && \ /defaults \
/lsiopy && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
rm -rf \ rm -rf \
/tmp/* /tmp/*

9
Dockerfile.aarch64
View file

@ -30,7 +30,7 @@ RUN \
sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow
# set version for s6 overlay # set version for s6 overlay
ARG S6_OVERLAY_VERSION="3.1.2.1" ARG S6_OVERLAY_VERSION="3.1.5.0"
ARG S6_OVERLAY_ARCH="aarch64" ARG S6_OVERLAY_ARCH="aarch64"
# add s6 overlay # add s6 overlay
@ -62,7 +62,9 @@ HOME="/root" \
TERM="xterm" \ TERM="xterm" \
S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \
S6_VERBOSITY=1 \ S6_VERBOSITY=1 \
S6_STAGE2_HOOK=/docker-mods S6_STAGE2_HOOK=/docker-mods \
VIRTUAL_ENV=/lsiopy \
PATH="/lsiopy/bin:$PATH"
RUN \ RUN \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \
@ -83,7 +85,8 @@ RUN \
mkdir -p \ mkdir -p \
/app \ /app \
/config \ /config \
/defaults && \ /defaults \
/lsiopy && \
echo "**** add qemu ****" && \ echo "**** add qemu ****" && \
curl -o \ curl -o \
/usr/bin/qemu-aarch64-static -L \ /usr/bin/qemu-aarch64-static -L \

2
Dockerfile.armhf
View file

@ -30,7 +30,7 @@ RUN \
sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow
# set version for s6 overlay # set version for s6 overlay
ARG S6_OVERLAY_VERSION="3.1.2.1" ARG S6_OVERLAY_VERSION="3.1.5.0"
ARG S6_OVERLAY_ARCH="armhf" ARG S6_OVERLAY_ARCH="armhf"
# add s6 overlay # add s6 overlay