Skip to content

Fix Renovate S6 tracking, bump S6 to 3.2.3.0, improve layer caching #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
modem7 merged 1 commit into from
Jun 27, 2026
Merged

Fix Renovate S6 tracking, bump S6 to 3.2.3.0, improve layer caching #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/).

## 2026-06-27 (continued 6)

### Fixed

- `renovate.json`: add `versioningTemplate: "loose"` to the S6 overlay custom manager. S6 uses 4-part version numbers (`3.2.0.2`) which aren't valid semver — without `loose` versioning Renovate silently skips S6 updates.

### Changed

- S6 overlay updated from `3.2.0.2` to `3.2.3.0`.

## 2026-06-27 (continued 5)

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
FROM base AS base-arm64
ENV S6_OVERLAY_ARCH=aarch64

FROM base-${TARGETARCH}${TARGETVARIANT}

Check failure on line 17 in Dockerfile

View workflow job for this annotation

GitHub Actions / Lint 

DL3006 style: Always tag the version of an image explicitly

Check failure on line 17 in Dockerfile

View workflow job for this annotation

GitHub Actions / Lint 

DL3006 style: Always tag the version of an image explicitly

ARG S6_OVERLAY_VERSION=3.2.0.2
ARG S6_OVERLAY_VERSION=3.2.3.0

# Add S6 Overlay
ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz /tmp/s6-overlay.tar.xz
Expand All @@ -33,7 +33,7 @@
S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \
TZ="Europe/London"

RUN <<EOF

Check failure on line 36 in Dockerfile

View workflow job for this annotation

GitHub Actions / Lint 

DL3018 style: Pin versions in apk add. Instead of `apk add <package>` use `apk add <package>=<version>`

Check failure on line 36 in Dockerfile

View workflow job for this annotation

GitHub Actions / Lint 

DL3018 style: Pin versions in apk add. Instead of `apk add <package>` use `apk add <package>=<version>`
set -xe
apk upgrade --update --no-cache
tar -C / -Jxpf /tmp/s6-overlay.tar.xz
Expand Down Expand Up @@ -67,7 +67,7 @@

COPY --link requirements.txt /

RUN --mount=type=cache,id=pip,target=/root/.cache,sharing=locked \

Check failure on line 70 in Dockerfile

View workflow job for this annotation

GitHub Actions / Lint 

DL3018 style: Pin versions in apk add. Instead of `apk add <package>` use `apk add <package>=<version>`

Check failure on line 70 in Dockerfile

View workflow job for this annotation

GitHub Actions / Lint 

DL3013 style: Pin versions in pip. Instead of `pip install <package>` use `pip install <package>==<version>` or `pip install --requirement <requirements file>`

Check failure on line 70 in Dockerfile

View workflow job for this annotation

GitHub Actions / Lint 

DL3042 style: Avoid use of cache directory with pip. Use `pip install --no-cache-dir <package>`

Check failure on line 70 in Dockerfile

View workflow job for this annotation

GitHub Actions / Lint 

DL3018 style: Pin versions in apk add. Instead of `apk add <package>` use `apk add <package>=<version>`

Check failure on line 70 in Dockerfile

View workflow job for this annotation

GitHub Actions / Lint 

DL3013 style: Pin versions in pip. Instead of `pip install <package>` use `pip install <package>==<version>` or `pip install --requirement <requirements file>`

Check failure on line 70 in Dockerfile

View workflow job for this annotation

GitHub Actions / Lint 

DL3042 style: Avoid use of cache directory with pip. Use `pip install --no-cache-dir <package>`
<<EOF
set -xe
python3 -m pip install -U pip
Expand Down
3 changes: 2 additions & 1 deletion renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"matchStrings": ["ARG S6_OVERLAY_VERSION=(?<currentValue>[0-9.]+)"],
"depNameTemplate": "just-containers/s6-overlay",
"datasourceTemplate": "github-releases",
"extractVersionTemplate": "^v(?<version>.+)$"
"extractVersionTemplate": "^v(?<version>.+)$",
"versioningTemplate": "loose"
},
{
"customType": "regex",
Expand Down