Skip to content

Commit 044d4e5

Browse files
committed
feat: update to s6 v3
1 parent 48b082b commit 044d4e5

File tree

7 files changed

+11
-7
lines changed

7 files changed

+11
-7
lines changed

Dockerfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ LABEL maintainer="LanCache.Net Team <team@lancache.net>"
33

44
ARG DEBIAN_FRONTEND=noninteractive
55
ARG ARCH="amd64"
6-
ARG OVERLAY_VERSION="v2.2.0.3"
6+
ARG ARCH_ALT="x86_64"
7+
ARG OVERLAY_VERSION="3.2.0.0"
78

89
ENV \
910
S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
11+
S6_VERBOSITY=1 \
1012
LC_ALL=en_GB.UTF-8 \
1113
LANG=en_GB.UTF-8 \
1214
LANGUAGE=en_GB.UTF-8 \
@@ -16,12 +18,14 @@ COPY overlay/ /
1618

1719
RUN \
1820
apt-get -y update && apt-get -y upgrade && \
19-
apt-get -y install curl wget bzip2 locales tzdata --no-install-recommends && \
21+
apt-get -y install ca-certificates curl locales tzdata wget xz-utils --no-install-recommends && \
2022
locale-gen en_GB.utf8 && \
2123
update-locale LANG=en_GB.utf8 \
2224
cd /tmp && \
23-
curl -sSfL -o s6-overlay.tar.gz "https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${ARCH}.tar.gz" && \
24-
tar xfz s6-overlay.tar.gz -C / && \
25+
curl -sSfL -o s6-overlay-noarch.tar.xz "https://github.com/just-containers/s6-overlay/releases/download/v${OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" && \
26+
curl -sSfL -o s6-overlay.tar.xz "https://github.com/just-containers/s6-overlay/releases/download/v${OVERLAY_VERSION}/s6-overlay-${ARCH_ALT}.tar.xz" && \
27+
tar -C / -Jpxf s6-overlay-noarch.tar.xz && \
28+
tar -C / -Jpxf s6-overlay.tar.xz && \
2529
apt-get -y clean && \
2630
rm -rf /tmp/* /var/lib/apt/lists/*
2731

goss.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
package:
2-
bzip2:
3-
installed: true
42
curl:
53
installed: true
64
wget:

overlay/etc/s6-overlay/s6-rc.d/asciilogo/dependencies.d/base

Whitespace-only changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
oneshot
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/etc/s6-overlay/scripts/asciilogo

overlay/etc/s6-overlay/s6-rc.d/user/contents.d/asciilogo

Whitespace-only changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/with-contenv bash
1+
#!/command/with-contenv bash
22

33
cat <<EOF
44
_ _____ _ _

0 commit comments

Comments
 (0)