Skip to content
This repository was archived by the owner on Apr 23, 2024. It is now read-only.

Commit da1442e

Browse files
committed
Migrate to s6v3
1 parent 8f4f83c commit da1442e

File tree

27 files changed

+53
-29
lines changed

27 files changed

+53
-29
lines changed

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:3.15
1+
FROM ghcr.io/linuxserver/baseimage-alpine:3.16
22

33
# set version label
44
ARG BUILD_DATE
@@ -8,6 +8,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="thespad"
99

1010
# environment settings
11+
ENV S6_STAGE2_HOOK=/init-hook
1112
ENV HOME="/config" \
1213
PYTHONIOENCODING=utf-8
1314

@@ -41,9 +42,9 @@ RUN \
4142
/app/pmm --strip-components=1 && \
4243
cd /app/pmm && \
4344
python3 -m pip install --upgrade pip && \
44-
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \
45+
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ \
4546
wheel && \
46-
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.15/ -r requirements.txt && \
47+
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r requirements.txt && \
4748
pip3 cache purge && \
4849
echo "**** cleanup ****" && \
4950
ln -s \

Dockerfile.aarch64

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
1+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
22

33
# set version label
44
ARG BUILD_DATE
@@ -8,6 +8,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="thespad"
99

1010
# environment settings
11+
ENV S6_STAGE2_HOOK=/init-hook
1112
ENV HOME="/config" \
1213
PYTHONIOENCODING=utf-8
1314

@@ -41,9 +42,9 @@ RUN \
4142
/app/pmm --strip-components=1 && \
4243
cd /app/pmm && \
4344
python3 -m pip install --upgrade pip && \
44-
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \
45+
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ \
4546
wheel && \
46-
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.15/ -r requirements.txt && \
47+
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r requirements.txt && \
4748
pip3 cache purge && \
4849
echo "**** cleanup ****" && \
4950
ln -s \

Dockerfile.armhf

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
1+
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
22

33
# set version label
44
ARG BUILD_DATE
@@ -8,6 +8,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="thespad"
99

1010
# environment settings
11+
ENV S6_STAGE2_HOOK=/init-hook
1112
ENV HOME="/config" \
1213
PYTHONIOENCODING=utf-8
1314

@@ -41,9 +42,9 @@ RUN \
4142
/app/pmm --strip-components=1 && \
4243
cd /app/pmm && \
4344
python3 -m pip install --upgrade pip && \
44-
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \
45+
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ \
4546
wheel && \
46-
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.15/ -r requirements.txt && \
47+
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r requirements.txt && \
4748
pip3 cache purge && \
4849
echo "**** cleanup ****" && \
4950
ln -s \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,4 +236,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
236236

237237
## Versions
238238

239+
* **03.10.22:** - Rebase to Alpine 3.16, migrate to s6v3.
239240
* **30.01.22:** - Initial Release.

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,5 @@ app_setup_block: |
5656
5757
# changelog
5858
changelogs:
59+
- { date: "03.10.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3." }
5960
- { date: "30.01.22:", desc: "Initial Release." }

root/etc/cont-init.d/50-config

Lines changed: 0 additions & 11 deletions
This file was deleted.

root/etc/cont-init.d/55-oneshot

Lines changed: 0 additions & 8 deletions
This file was deleted.

root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-pmm-config

Whitespace-only changes.

root/etc/s6-overlay/s6-rc.d/init-pmm-config/dependencies.d/init-config

Whitespace-only changes.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/with-contenv bash
2+
3+
# permissions
4+
chown -R abc:abc \
5+
/config

0 commit comments

Comments
 (0)