Skip to content
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

Jump to bottom

Set the PHP_BUILD_PROVIDER variable #1441

Merged
merged 1 commit into from
Dec 15, 2023
Merged

Set the PHP_BUILD_PROVIDER variable #1441

merged 1 commit into from
Dec 15, 2023

Conversation

TimWolla
Copy link
Contributor

TimWolla
TimWolla commented Sep 13, 2023
View reviewed changes
Dockerfile-linux.template Outdated
Comment on lines 241 to 242
ARG PHP_BUILD_PROVIDER="Docker Official Images"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible for the actual builders to set this argument? This would allow the actually official builds to carry the tag, whereas and manual builds of the Dockerfiles do not.

@TimWolla
Copy link
Contributor Author

Example screenshot (with messed up quoting, thus cutting off at the space, but I didn't want to rebuild, because it takes ages):

image

@tianon
Copy link
Member

tianon commented Dec 13, 2023

Oof, looking at that upstream block is giving me some hives -- we should probably set PHP_UNAME too (like the intent of https://salsa.debian.org/php-team/php/-/blob/0085363b2a1af13bcf20b34f22eb38a0263ecead/debian/patches/0024-php-5.4.9-fixheader.patch) 😕

Maybe we set the provider to "https://github.com/docker-library/php" so it doesn't really matter as much where the builds happened? I guess that won't help for modified builds, but I don't think there's much we can actually do there (and it's then an accurate pointer to where the source originated, even if it was then modified).

Also, I'd prefer to set these in the RUN line as local environment variables (instead of ARG, which has other annoying behaviors).

@TimWolla
Copy link
Contributor Author

Updated.

@tianon tianon merged commit f42c0a5 into docker-library:master Dec 15, 2023
86 checks passed
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Dec 15, 2023
@docker-library-bot
Update php
1460d98 
Changes:

- docker-library/php@0aff58cf: Merge pull request docker-library/php#1475 from infosiftr/php_uname
- docker-library/php@50c8b1ce: Set PHP_UNAME to a fixed value too
- docker-library/php@f42c0a54: Merge pull request docker-library/php#1441 from TimWolla/build-provider
- docker-library/php@4299a66f: Update GHA YAML with bashbrew example improvements (esp. concurrency:)
- docker-library/php@5f736d03: Set the PHP_BUILD_PROVIDER variable
@tianon tianon mentioned this pull request Dec 15, 2023
Merged
@TimWolla TimWolla deleted the build-provider branch December 24, 2023 15:40
martin-g pushed a commit to martin-g/docker-official-images that referenced this pull request Apr 3, 2024
@docker-library-bot @martin-g
Update php
4e1488b 
Changes:

- docker-library/php@0aff58cf: Merge pull request docker-library/php#1475 from infosiftr/php_uname
- docker-library/php@50c8b1ce: Set PHP_UNAME to a fixed value too
- docker-library/php@f42c0a54: Merge pull request docker-library/php#1441 from TimWolla/build-provider
- docker-library/php@4299a66f: Update GHA YAML with bashbrew example improvements (esp. concurrency:)
- docker-library/php@5f736d03: Set the PHP_BUILD_PROVIDER variable
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@TimWolla @tianon