From 8d69d6079de67fd8b8aeb7c581b43e928b3164c4 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 12 May 2023 19:37:23 +0100 Subject: [PATCH 1/2] Bump s6 to 3.1.5.0 (Edge) --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a4045ea..f0c83e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ RUN \ sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow # 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" # add s6 overlay diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index dde1582..c9d4954 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -30,7 +30,7 @@ RUN \ sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow # 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" # add s6 overlay diff --git a/Dockerfile.armhf b/Dockerfile.armhf index c57cd73..23d851e 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -30,7 +30,7 @@ RUN \ sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow # 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" # add s6 overlay From ce069f2039d314e5811073d49ab16b24f5a6146e Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 15 May 2023 21:03:09 +0100 Subject: [PATCH 2/2] Create lsiopy venv folder and envs --- Dockerfile | 15 +++++++++------ Dockerfile.aarch64 | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index f0c83e2..5125d43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,11 +58,13 @@ ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-s # environment variables ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ -HOME="/root" \ -TERM="xterm" \ -S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ -S6_VERBOSITY=1 \ -S6_STAGE2_HOOK=/docker-mods + HOME="/root" \ + TERM="xterm" \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ + S6_VERBOSITY=1 \ + S6_STAGE2_HOOK=/docker-mods \ + VIRTUAL_ENV=/lsiopy \ + PATH="/lsiopy/bin:$PATH" RUN \ echo "**** install runtime packages ****" && \ @@ -83,7 +85,8 @@ RUN \ mkdir -p \ /app \ /config \ - /defaults && \ + /defaults \ + /lsiopy && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c9d4954..b603a1b 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -58,11 +58,13 @@ ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-s # environment variables ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ -HOME="/root" \ -TERM="xterm" \ -S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ -S6_VERBOSITY=1 \ -S6_STAGE2_HOOK=/docker-mods + HOME="/root" \ + TERM="xterm" \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ + S6_VERBOSITY=1 \ + S6_STAGE2_HOOK=/docker-mods \ + VIRTUAL_ENV=/lsiopy \ + PATH="/lsiopy/bin:$PATH" RUN \ echo "**** install runtime packages ****" && \ @@ -83,7 +85,8 @@ RUN \ mkdir -p \ /app \ /config \ - /defaults && \ + /defaults \ + /lsiopy && \ echo "**** add qemu ****" && \ curl -o \ /usr/bin/qemu-aarch64-static -L \