Skip to content

chore(docker): add ASF Incubator disclaimer to Dockerfiles#4925

Merged
bobbai00 merged 3 commits into
apache:mainfrom
bobbai00:fix/4924-dockerfile-incubator-disclaimer
May 4, 2026
Merged

chore(docker): add ASF Incubator disclaimer to Dockerfiles#4925
bobbai00 merged 3 commits into
apache:mainfrom
bobbai00:fix/4924-dockerfile-incubator-disclaimer

Conversation

@bobbai00
Copy link
Copy Markdown
Contributor

@bobbai00 bobbai00 commented May 4, 2026

What changes were proposed in this PR?

Add the standard ASF Incubator disclaimer comment block below the existing ASF license header in every Dockerfile in the repo: root Dockerfile, all bin/*.dockerfile (9 files), bin/y-websocket-server/Dockerfile, bin/pylsp/Dockerfile. Disclaimer text matches DISCLAIMER at the repo root.

Any related issues, documentation, discussions?

Closes #4924.

How was this PR tested?

Comment-only change; no functional impact. git diff --stat shows 12 Dockerfiles touched, +9 each.

Was this PR authored or co-authored using generative AI tooling?

Generated-by: Claude Code (Opus 4.7)

bobbai00 added 2 commits May 4, 2026 10:11
Per ASF Incubator release/distribution rules, Dockerfiles should carry
the incubator disclaimer in addition to the ASF license header so the
incubating status is visible to anyone reading the Dockerfile alone.

Closes apache#4924
Same change as the Dockerfile/y-websocket-server/pylsp updates: insert
the standard incubator disclaimer below the ASF license header in every
service Dockerfile under bin/.
@bobbai00 bobbai00 requested a review from aglinxinyuan May 4, 2026 17:27
@bobbai00 bobbai00 added the release/v1.1.0-incubating back porting to release/v1.1.0-incubating label May 4, 2026
@bobbai00 bobbai00 enabled auto-merge (squash) May 4, 2026 18:43
@bobbai00 bobbai00 merged commit ea6607e into apache:main May 4, 2026
19 checks passed
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 4, 2026

Backport to release/v1.1.0-incubating failed. See job log.

Conflicts in:

  • bin/texera-web-application.dockerfile

Likely-missing prerequisites on main (commits that touched these files between merge-base 9b42aede and ea6607e7^ — consider backporting these first):

  • 798219386 chore(deps): upgrade frontend Node engine to 24 (#4658)
  • ab700081e chore: drop -WIP suffix from DISCLAIMER (#4555)
  • cfe472e9c chore(licensing): per-module LICENSE/NOTICE binaries with per-image concat (#4668)

bobbai00 added a commit that referenced this pull request May 4, 2026
### What changes were proposed in this PR?

Manual backport of #4925 to `release/v1.1.0-incubating`. Auto-backport
failed because `bin/texera-web-application.dockerfile` diverged on main
(Node 22 → 24 in #4658, landed 2026-05-02). Conflict resolved by keeping
the release branch's `FROM node:22-bookworm` and inserting the
disclaimer block above it. The other 11 Dockerfiles applied cleanly.

### Any related issues, documentation, discussions?

Backport of #4925. Closes the auto-backport failure noted at
https://github.com/apache/texera/actions/runs/25336814980/job/74284062316.

### How was this PR tested?

Comment-only change; no functional impact. `git diff --stat
upstream/release/v1.1.0-incubating` shows 12 Dockerfiles touched, +9
each (+108 / 0).

### Was this PR authored or co-authored using generative AI tooling?

Generated-by: Claude Code (Opus 4.7)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dev fix release/v1.1.0-incubating back porting to release/v1.1.0-incubating

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Dockerfiles missing ASF Incubator disclaimer comment

2 participants