Fix dockerlint by Zoey2936 · Pull Request #8523 · nextcloud/all-in-one

Zoey2936 · 2026-08-02T15:00:02Z

Resolves: #

Summary

The PR was tested and verified that it works locally
Sign-off message is added to all commits
Tests (playwright if possible) are included
Screenshots before/after for front-end changes
Documentation has been updated or is not required
Labels added where applicable (ex: bug/enhancement, 3. to review, feature component)
Milestone next added

AI (if applicable)

The content of this PR was partly or fully generated using AI

Copilot

Pull request overview

This PR aims to fix the Docker lint (hadolint) CI workflow and normalize mixed line endings across various markdown/docs and small scripts in the repository.

Changes:

Normalizes line endings/formatting in QA plans and documentation markdown files.
Updates multiple container Dockerfiles to satisfy hadolint expectations (e.g., SHELL ... pipefail, USER user:group, JSON-array HEALTHCHECK forms).
Adjusts the GitHub Actions Docker lint workflow logic.

Reviewed changes

Copilot reviewed 20 out of 46 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
tests/QA/readme.md	Line ending / formatting normalization.
tests/QA/assets/backup-archive/readme.md	Line ending / formatting normalization.
tests/QA/080-daily-backup-script.md	Line ending / formatting normalization.
tests/QA/070-timezone-change.md	Line ending / formatting normalization.
tests/QA/060-environmental-variables.md	Line ending / formatting normalization.
tests/QA/050-optional-addons.md	Line ending / formatting normalization.
tests/QA/040-login-behavior.md	Line ending / formatting normalization.
tests/QA/030-aio-password-change.md	Line ending / formatting normalization.
tests/QA/020-backup-and-restore.md	Line ending / formatting normalization.
tests/QA/010-restore-instance.md	Line ending / formatting normalization.
tests/QA/004-initial-backup.md	Line ending / formatting normalization.
tests/QA/003-automatic-login.md	Line ending / formatting normalization.
tests/QA/002-new-instance.md	Line ending / formatting normalization.
tests/QA/001-initial-setup.md	Line ending / formatting normalization.
php/src/Cron/UpdateMastercontainer.php	Line ending / formatting normalization.
php/src/Cron/StopContainers.php	Line ending / formatting normalization (includes a misleading comment).
php/src/Cron/StartContainers.php	Line ending / formatting normalization.
php/src/Cron/StartAndUpdateContainers.php	Line ending / formatting normalization.
php/src/Cron/CreateBackup.php	Line ending / formatting normalization.
php/src/Cron/CheckBackup.php	Line ending / formatting normalization.
php/public/second-tab-warning.js	Line ending / formatting normalization.
manual-install/readme.md	Line ending / formatting normalization.
Containers/whiteboard/Dockerfile	Adjusts `USER` and `HEALTHCHECK` to be more lint-friendly.
Containers/watchtower/Dockerfile	Adjusts `USER` to `user:group` form.
Containers/talk/Dockerfile	Adds `SHELL ... pipefail`, changes `USER`, and switches to JSON-array `HEALTHCHECK`.
Containers/talk-recording/Dockerfile	Adds `SHELL ... pipefail`, changes `USER`, and switches to JSON-array `HEALTHCHECK`.
Containers/redis/Dockerfile	Adds `SHELL ... pipefail`, changes `USER`, and switches to JSON-array `HEALTHCHECK`.
Containers/postgresql/Dockerfile	Adds `SHELL ... pipefail`, changes `USER`, and switches to JSON-array `HEALTHCHECK`.
Containers/onlyoffice/Dockerfile	Switches to JSON-array `HEALTHCHECK`.
Containers/notify-push/Dockerfile	Adds `SHELL ... pipefail`, changes `USER`, adjusts user/group handling, and switches to JSON-array `HEALTHCHECK`.
Containers/nextcloud/Dockerfile	Adds `SHELL ... pipefail`, adjusts `USER`, and switches to JSON-array `HEALTHCHECK`.
Containers/nextcloud/config/swift.config.php	Line ending / formatting normalization.
Containers/nextcloud/config/s3.config.php	Line ending / formatting normalization.
Containers/mastercontainer/Dockerfile	Adds `SHELL ... pipefail`, adjusts `USER`, and switches to JSON-array `HEALTHCHECK`.
Containers/imaginary/Dockerfile	Changes `USER` and switches to JSON-array `HEALTHCHECK` (plus formatting).
Containers/fulltextsearch/Dockerfile	Adjusts `USER` and switches to JSON-array `HEALTHCHECK`.
Containers/eurooffice/Dockerfile	Switches to JSON-array `HEALTHCHECK`.
Containers/domaincheck/Dockerfile	Uses `USER user:group` and converts `HEALTHCHECK` to exec form with `/bin/sh -c`.
Containers/docker-socket-proxy/Dockerfile	Adjusts `USER` and switches to JSON-array `HEALTHCHECK`.
Containers/collabora/Dockerfile	Adjusts `USER` and switches to JSON-array `HEALTHCHECK`.
Containers/clamav/Dockerfile	Changes `USER` and switches to JSON-array `HEALTHCHECK`.
Containers/borgbackup/Dockerfile	Adjusts `USER` to `user:group` form.
Containers/apache/supervisord.conf	Line ending / formatting normalization.
Containers/apache/Dockerfile	Adds `SHELL ... pipefail`, changes `USER`, and switches to JSON-array `HEALTHCHECK`.
.github/workflows/update-yaml.yml	Line ending / formatting normalization.
.github/workflows/docker-lint.yml	Updates Dockerfile discovery and hadolint invocation logic.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

+/** @var \AIO\Controller\DockerController $dockerController */
+$dockerController = $container->get(\AIO\Controller\DockerController::class);
+
+// Start apache


Copilot

Pull request overview

Copilot reviewed 20 out of 46 changed files in this pull request and generated no new comments.

Suppressed comments (1)

Containers/clamav/Dockerfile:40

The image now switches to USER clamav:clamav, but the earlier ownership setup still hard-codes numeric IDs (chown -R 100:100 /var/lib/clamav). This reintroduces an implicit assumption about the upstream UID/GID mapping and can lead to permission issues if the packaged clamav user/group IDs ever differ. Consider aligning ownership with the named user/group (as done elsewhere, e.g. Containers/talk-recording/Dockerfile:49).

USER clamav:clamav
RUN set -ex; \
    freshclam --foreground --stdout

szaimen · 2026-08-03T13:45:03Z

Hey, thanks a lot for the PR! I'll have a look soon! :)

szaimen · 2026-08-05T09:07:10Z

@Zoey2936 thanks a lot for the PR! Can you please split the change of line endings into a different PR so that we can focus with this one on fixing the dockerlint? Thanks in advance! :)

Zoey2936 · 2026-08-05T17:40:07Z

@Zoey2936 thanks a lot for the PR! Can you please split the change of line endings into a different PR so that we can focus with this one on fixing the dockerlint? Thanks in advance! :)

done here and #8542

szaimen · 2026-08-05T18:01:57Z

Please rebase this branch

Zoey2936 · 2026-08-05T18:06:51Z

done

szaimen · 2026-08-05T18:08:31Z

Please rebase instead of merging in this case

Zoey2936 · 2026-08-05T18:10:26Z

done

Signed-off-by: Zoey <zoey@z0ey.de>

pabzm

Thank you for the PR! I've got a few questions and one request for a comment.

pabzm · 2026-08-07T08:45:39Z

-            # DL4006 warning: Set the SHELL option -o pipefail before RUN with a pipe in it. If you are using /bin/sh in an alpine image or if your shell is symlinked to busybox then consider explicitly setting your SHELL to /bin/ash, or disable this check
-            hadolint "$file" --ignore DL3018 --ignore DL4006 | tee -a ./hadolint.log
+            # DL3041 warning: Specify version with `dnf install -y <package>-<version>`.
+            # DL3066 info: Non-numeric user-id may not be resolvable by host system


Do we still need this, despite the user-IDs being replaced by usernames in this same PR?

yes since the dockerlint rules wants to use the id numbers instead of usernames, but I think using IDs will break faster then usernames

pabzm · 2026-08-07T08:47:59Z

-          if grep -q "DL[0-9]\+\|SC[0-9]\+" ./hadolint.log; then
+          if [ -s hadolint.log ]; then


This isn't quite the same. Any output of executing hadolint (even coming from the shell, not even hadolint itself) would now abort the further execution of the script.

Can you explain why you changed this?

because hadolint only prints to console if it finds issues and output/no-outpout is easier to detect than reading the file for a regex which could break easier

pabzm · 2026-08-07T08:48:14Z


 VOLUME /mnt/data

+SHELL ["/bin/ash", "-o", "pipefail", "-c"]


Why ash instead of the default sh?

https://github.com/hadolint/hadolint/wiki/DL4006

pabzm · 2026-08-07T08:48:40Z


 # AIO settings start # Do not remove or change this line!
 ENV NEXTCLOUD_VERSION=33.0.7
+# hadolint ignore=DL3064


Please add a comment what this is required for.

https://github.com/hadolint/hadolint/wiki/DL3064 I'm cutrently on mobile, can you please create a suggestion?

Zoey2936 requested review from Copilot and szaimen August 2, 2026 15:00

Copilot started reviewing on behalf of Zoey2936 August 2, 2026 15:42 View session

Copilot AI reviewed Aug 2, 2026

View reviewed changes

Zoey2936 commented Aug 2, 2026

View reviewed changes

Comment thread .github/workflows/docker-lint.yml Outdated

Zoey2936 commented Aug 2, 2026

View reviewed changes

Comment thread .github/workflows/docker-lint.yml Outdated

Zoey2936 requested a review from Copilot August 2, 2026 15:47

Copilot started reviewing on behalf of Zoey2936 August 2, 2026 15:48 View session

Copilot AI reviewed Aug 2, 2026

View reviewed changes

szaimen added 3. to review Waiting for reviews enhancement New feature or request labels Aug 3, 2026

szaimen added this to the next milestone Aug 3, 2026

szaimen added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Aug 5, 2026

Zoey2936 mentioned this pull request Aug 5, 2026

renormalize line endings #8542

Merged

8 tasks

Zoey2936 force-pushed the fix-dockerlint branch 6 times, most recently from ccdac8d to bc7e850 Compare August 5, 2026 17:36

Zoey2936 changed the title ~~Fix dockerlint and fix mixed line endings~~ Fix dockerlint Aug 5, 2026

szaimen closed this in #8542 Aug 5, 2026

szaimen reopened this Aug 5, 2026

Zoey2936 force-pushed the fix-dockerlint branch 2 times, most recently from 89ebee2 to d0619ea Compare August 5, 2026 18:10

szaimen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Aug 5, 2026

szaimen requested a review from pabzm August 5, 2026 18:32

fix dockerlint

8bf6193

Signed-off-by: Zoey <zoey@z0ey.de>

Zoey2936 force-pushed the fix-dockerlint branch from d0619ea to 8bf6193 Compare August 5, 2026 18:42

szaimen modified the milestones: v13.5.0, next Aug 6, 2026

pabzm requested changes Aug 7, 2026

View reviewed changes

This was referenced Aug 15, 2026

publish new images after recent PRs are merged and tested #8547

Open

Update all existing instances to nc34 #8327

Open

publish new images after recent PRs are merged and tested #8584

Open

szaimen modified the milestones: v13.6.0, next Aug 18, 2026

		if grep -q "DL[0-9]\+\\|SC[0-9]\+" ./hadolint.log; then
		if [ -s hadolint.log ]; then

Uh oh!

Conversation

Zoey2936 commented Aug 2, 2026 • edited by szaimen Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

AI (if applicable)

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

szaimen commented Aug 3, 2026

Uh oh!

szaimen commented Aug 5, 2026

Uh oh!

Zoey2936 commented Aug 5, 2026

Uh oh!

szaimen commented Aug 5, 2026

Uh oh!

Zoey2936 commented Aug 5, 2026

Uh oh!

szaimen commented Aug 5, 2026

Uh oh!

Zoey2936 commented Aug 5, 2026

Uh oh!

pabzm left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Zoey2936 commented Aug 2, 2026 •

edited by szaimen

Loading