Skip to content

Commit

Permalink
feat: update to s6 v3
Browse files Browse the repository at this point in the history
  • Loading branch information
nightah committed Sep 25, 2024
1 parent 48b082b commit 044d4e5
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 7 deletions.
12 changes: 8 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ LABEL maintainer="LanCache.Net Team <[email protected]>"

ARG DEBIAN_FRONTEND=noninteractive
ARG ARCH="amd64"
ARG OVERLAY_VERSION="v2.2.0.3"
ARG ARCH_ALT="x86_64"
ARG OVERLAY_VERSION="3.2.0.0"

ENV \
S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
S6_VERBOSITY=1 \
LC_ALL=en_GB.UTF-8 \
LANG=en_GB.UTF-8 \
LANGUAGE=en_GB.UTF-8 \
Expand All @@ -16,12 +18,14 @@ COPY overlay/ /

RUN \
apt-get -y update && apt-get -y upgrade && \
apt-get -y install curl wget bzip2 locales tzdata --no-install-recommends && \
apt-get -y install ca-certificates curl locales tzdata wget xz-utils --no-install-recommends && \
locale-gen en_GB.utf8 && \
update-locale LANG=en_GB.utf8 \
cd /tmp && \
curl -sSfL -o s6-overlay.tar.gz "https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${ARCH}.tar.gz" && \
tar xfz s6-overlay.tar.gz -C / && \
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" && \
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" && \
tar -C / -Jpxf s6-overlay-noarch.tar.xz && \
tar -C / -Jpxf s6-overlay.tar.xz && \
apt-get -y clean && \
rm -rf /tmp/* /var/lib/apt/lists/*

Expand Down
2 changes: 0 additions & 2 deletions goss.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
package:
bzip2:
installed: true
curl:
installed: true
wget:
Expand Down
Empty file.
1 change: 1 addition & 0 deletions overlay/etc/s6-overlay/s6-rc.d/asciilogo/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions overlay/etc/s6-overlay/s6-rc.d/asciilogo/up
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/scripts/asciilogo
Empty file.
2 changes: 1 addition & 1 deletion overlay/etc/cont-init.d/00-asciilogo → overlay/etc/s6-overlay/scripts/asciilogo
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

cat <<EOF
_ _____ _ _
Expand Down

0 comments on commit 044d4e5

Please sign in to comment.