Fix a bug where substitutions were not done for runtime. #754
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Ville Aikas <[email protected]>
11 tasks
kaniini
approved these changes
Oct 16, 2023
vaikas
added a commit
to vaikas/os
that referenced
this pull request
Oct 17, 2023
*DO NOT MERGE UNTIL chainguard-dev/melange#754 goes in. ***** After installing with apk add php-8.3 also installs the php-8.3-config ``` 22ea88231f3b:/work/packages# apk add ./aarch64/php-8.3-8.3_rc3-r14.apk (1/8) Installing xz (5.4.4-r0) (2/8) Installing libxml2 (2.11.5-r1) (3/8) Installing php-8.3-config (8.3_rc3-r14) (4/8) Installing ncurses-terminfo-base (6.4_p20230722-r1) (5/8) Installing ncurses (6.4_p20230722-r1) (6/8) Installing readline (8.2-r2) (7/8) Installing sqlite (3.40.0-r1) (8/8) Installing php-8.3 (8.3_rc3-r14) OK: 32 MiB in 27 packages 22ea88231f3b:/work/packages# apk info -L php-8.3-config php-8.3-config-8.3_rc3-r14 contains: etc/php/php.ini var/lib/db/sbom/php-8.3-config-8.3_rc3-r14.spdx.json 22ea88231f3b:/work/packages# apk info -L php-8.3 php-8.3-8.3_rc3-r14 contains: bin/php usr/bin/phar usr/bin/phar.phar usr/bin/php usr/share/man/man1/phar.1 usr/share/man/man1/phar.phar.1 usr/share/man/man1/php-cgi.1 usr/share/man/man1/php-config.1 usr/share/man/man1/php.1 usr/share/man/man1/phpdbg.1 usr/share/man/man1/phpize.1 usr/share/man/man8/php-fpm.8 usr/share/php/fpm/status.html var/lib/db/sbom/php-8.3-8.3_rc3-r14.spdx.json ``` Spot checking an extension: ``` 22ea88231f3b:/work/packages# apk add ./aarch64/php-8.3-gettext-8.3_rc3-r14.apk (1/2) Installing php-8.3-gettext-config (8.3_rc3-r14) (2/2) Installing php-8.3-gettext (8.3_rc3-r14) 22ea88231f3b:/work/packages# apk info -L php-8.3-gettext php-8.3-gettext-8.3_rc3-r14 contains: usr/lib/php/modules/gettext.so var/lib/db/sbom/php-8.3-gettext-8.3_rc3-r14.spdx.json 22ea88231f3b:/work/packages# apk info -L php-8.3-gettext-config php-8.3-gettext-config-8.3_rc3-r14 contains: etc/php/conf.d/gettext.ini var/lib/db/sbom/php-8.3-gettext-config-8.3_rc3-r14.spdx.json ``` Signed-off-by: Ville Aikas <[email protected]>
github-merge-queue bot
pushed a commit
to wolfi-dev/os
that referenced
this pull request
Oct 17, 2023
bump wolfictl to pick up: chainguard-dev/melange#754
vaikas
added a commit
to vaikas/os
that referenced
this pull request
Oct 17, 2023
*DO NOT MERGE UNTIL chainguard-dev/melange#754 goes in. ***** After installing with apk add php-8.3 also installs the php-8.3-config ``` 22ea88231f3b:/work/packages# apk add ./aarch64/php-8.3-8.3_rc3-r14.apk (1/8) Installing xz (5.4.4-r0) (2/8) Installing libxml2 (2.11.5-r1) (3/8) Installing php-8.3-config (8.3_rc3-r14) (4/8) Installing ncurses-terminfo-base (6.4_p20230722-r1) (5/8) Installing ncurses (6.4_p20230722-r1) (6/8) Installing readline (8.2-r2) (7/8) Installing sqlite (3.40.0-r1) (8/8) Installing php-8.3 (8.3_rc3-r14) OK: 32 MiB in 27 packages 22ea88231f3b:/work/packages# apk info -L php-8.3-config php-8.3-config-8.3_rc3-r14 contains: etc/php/php.ini var/lib/db/sbom/php-8.3-config-8.3_rc3-r14.spdx.json 22ea88231f3b:/work/packages# apk info -L php-8.3 php-8.3-8.3_rc3-r14 contains: bin/php usr/bin/phar usr/bin/phar.phar usr/bin/php usr/share/man/man1/phar.1 usr/share/man/man1/phar.phar.1 usr/share/man/man1/php-cgi.1 usr/share/man/man1/php-config.1 usr/share/man/man1/php.1 usr/share/man/man1/phpdbg.1 usr/share/man/man1/phpize.1 usr/share/man/man8/php-fpm.8 usr/share/php/fpm/status.html var/lib/db/sbom/php-8.3-8.3_rc3-r14.spdx.json ``` Spot checking an extension: ``` 22ea88231f3b:/work/packages# apk add ./aarch64/php-8.3-gettext-8.3_rc3-r14.apk (1/2) Installing php-8.3-gettext-config (8.3_rc3-r14) (2/2) Installing php-8.3-gettext (8.3_rc3-r14) 22ea88231f3b:/work/packages# apk info -L php-8.3-gettext php-8.3-gettext-8.3_rc3-r14 contains: usr/lib/php/modules/gettext.so var/lib/db/sbom/php-8.3-gettext-8.3_rc3-r14.spdx.json 22ea88231f3b:/work/packages# apk info -L php-8.3-gettext-config php-8.3-gettext-config-8.3_rc3-r14 contains: etc/php/conf.d/gettext.ini var/lib/db/sbom/php-8.3-gettext-config-8.3_rc3-r14.spdx.json ``` Signed-off-by: Ville Aikas <[email protected]>
vaikas
added a commit
to vaikas/os
that referenced
this pull request
Oct 17, 2023
*DO NOT MERGE UNTIL chainguard-dev/melange#754 goes in. ***** After installing with apk add php-8.3 also installs the php-8.3-config ``` 22ea88231f3b:/work/packages# apk add ./aarch64/php-8.3-8.3_rc3-r14.apk (1/8) Installing xz (5.4.4-r0) (2/8) Installing libxml2 (2.11.5-r1) (3/8) Installing php-8.3-config (8.3_rc3-r14) (4/8) Installing ncurses-terminfo-base (6.4_p20230722-r1) (5/8) Installing ncurses (6.4_p20230722-r1) (6/8) Installing readline (8.2-r2) (7/8) Installing sqlite (3.40.0-r1) (8/8) Installing php-8.3 (8.3_rc3-r14) OK: 32 MiB in 27 packages 22ea88231f3b:/work/packages# apk info -L php-8.3-config php-8.3-config-8.3_rc3-r14 contains: etc/php/php.ini var/lib/db/sbom/php-8.3-config-8.3_rc3-r14.spdx.json 22ea88231f3b:/work/packages# apk info -L php-8.3 php-8.3-8.3_rc3-r14 contains: bin/php usr/bin/phar usr/bin/phar.phar usr/bin/php usr/share/man/man1/phar.1 usr/share/man/man1/phar.phar.1 usr/share/man/man1/php-cgi.1 usr/share/man/man1/php-config.1 usr/share/man/man1/php.1 usr/share/man/man1/phpdbg.1 usr/share/man/man1/phpize.1 usr/share/man/man8/php-fpm.8 usr/share/php/fpm/status.html var/lib/db/sbom/php-8.3-8.3_rc3-r14.spdx.json ``` Spot checking an extension: ``` 22ea88231f3b:/work/packages# apk add ./aarch64/php-8.3-gettext-8.3_rc3-r14.apk (1/2) Installing php-8.3-gettext-config (8.3_rc3-r14) (2/2) Installing php-8.3-gettext (8.3_rc3-r14) 22ea88231f3b:/work/packages# apk info -L php-8.3-gettext php-8.3-gettext-8.3_rc3-r14 contains: usr/lib/php/modules/gettext.so var/lib/db/sbom/php-8.3-gettext-8.3_rc3-r14.spdx.json 22ea88231f3b:/work/packages# apk info -L php-8.3-gettext-config php-8.3-gettext-config-8.3_rc3-r14 contains: etc/php/conf.d/gettext.ini var/lib/db/sbom/php-8.3-gettext-config-8.3_rc3-r14.spdx.json ``` Signed-off-by: Ville Aikas <[email protected]>
vaikas
added a commit
to vaikas/os
that referenced
this pull request
Oct 17, 2023
*DO NOT MERGE UNTIL chainguard-dev/melange#754 goes in. ***** After installing with apk add php-8.3 also installs the php-8.3-config ``` 22ea88231f3b:/work/packages# apk add ./aarch64/php-8.3-8.3_rc3-r14.apk (1/8) Installing xz (5.4.4-r0) (2/8) Installing libxml2 (2.11.5-r1) (3/8) Installing php-8.3-config (8.3_rc3-r14) (4/8) Installing ncurses-terminfo-base (6.4_p20230722-r1) (5/8) Installing ncurses (6.4_p20230722-r1) (6/8) Installing readline (8.2-r2) (7/8) Installing sqlite (3.40.0-r1) (8/8) Installing php-8.3 (8.3_rc3-r14) OK: 32 MiB in 27 packages 22ea88231f3b:/work/packages# apk info -L php-8.3-config php-8.3-config-8.3_rc3-r14 contains: etc/php/php.ini var/lib/db/sbom/php-8.3-config-8.3_rc3-r14.spdx.json 22ea88231f3b:/work/packages# apk info -L php-8.3 php-8.3-8.3_rc3-r14 contains: bin/php usr/bin/phar usr/bin/phar.phar usr/bin/php usr/share/man/man1/phar.1 usr/share/man/man1/phar.phar.1 usr/share/man/man1/php-cgi.1 usr/share/man/man1/php-config.1 usr/share/man/man1/php.1 usr/share/man/man1/phpdbg.1 usr/share/man/man1/phpize.1 usr/share/man/man8/php-fpm.8 usr/share/php/fpm/status.html var/lib/db/sbom/php-8.3-8.3_rc3-r14.spdx.json ``` Spot checking an extension: ``` 22ea88231f3b:/work/packages# apk add ./aarch64/php-8.3-gettext-8.3_rc3-r14.apk (1/2) Installing php-8.3-gettext-config (8.3_rc3-r14) (2/2) Installing php-8.3-gettext (8.3_rc3-r14) 22ea88231f3b:/work/packages# apk info -L php-8.3-gettext php-8.3-gettext-8.3_rc3-r14 contains: usr/lib/php/modules/gettext.so var/lib/db/sbom/php-8.3-gettext-8.3_rc3-r14.spdx.json 22ea88231f3b:/work/packages# apk info -L php-8.3-gettext-config php-8.3-gettext-config-8.3_rc3-r14 contains: etc/php/conf.d/gettext.ini var/lib/db/sbom/php-8.3-gettext-config-8.3_rc3-r14.spdx.json ``` Signed-off-by: Ville Aikas <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Melange Pull Request Template
Fix a bug where substitutions were not done for
runtime.Functional Changes
Notes:
SCA Changes
Notes:
Linter
Notes: