Skip to content

Conversation

EtienneM
Copy link
Member

@EtienneM EtienneM commented Aug 29, 2025

I took the opportunity to slightly improve the package_php script.

Related to STORY-2492

@EtienneM EtienneM self-assigned this Aug 29, 2025
@EtienneM EtienneM force-pushed the feat/STORY-2477/scalingo-24-minimal branch from eb95b19 to 14649eb Compare August 29, 2025 09:30
@EtienneM EtienneM changed the title fix(get_gmp): m4 is a dependency fix: add APT dependencies to some scripts for scalingo-24-minimal Aug 29, 2025
Copy link

@EtienneM EtienneM force-pushed the feat/STORY-2477/scalingo-24-minimal branch from 4fe814e to ba5bc52 Compare August 29, 2025 10:02
@EtienneM EtienneM force-pushed the feat/STORY-2477/scalingo-24-minimal branch from 84286fa to c542e43 Compare September 1, 2025 14:44
fi

php_version="$1"
php_series="$(echo $php_version | cut -d '.' -f1,2)"
Copy link
Member Author

Choose a reason for hiding this comment

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

This variable is never used

export C_INCLUDE_PATH="$C_INCLUDE_PATH:/app/vendor/libonig/include"
export PKG_CONFIG_PATH="/app/vendor/libonig/lib/pkgconfig:$PKG_CONFIG_PATH"

echo "-----> Downloading dependency WebP library ${webp_version}"
Copy link
Member Author

Choose a reason for hiding this comment

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

I just moved this earlier

echo "-----> Downloading dependency zlib ${zlib_version}"
curl -LO "${PHP_BASE_URL}/zlib/zlib-${zlib_version}.tar.gz"
tar -xzvf "zlib-${zlib_version}.tar.gz"
tar -xzf "zlib-${zlib_version}.tar.gz"
Copy link
Member Author

Choose a reason for hiding this comment

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

I removed the verbosity of the tar calls as it pollutes stdout.

)

WITH_CURL_CONFIGURE=""
WITH_CURL_CONFIGURE="--with-curl=/usr"
Copy link
Member Author

Choose a reason for hiding this comment

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

This default value was already in the call to configure. We had a duplicated with-curl so I'm fixing this.

export WEBP_LIBS="-L/app/vendor/libwebp/lib -lwebp"
export WEBP_CFLAGS="-I/app/vendor/libwebp/include"

ENABLE_GD_CONFIGURE="--enable-gd --with-jpeg --with-freetype --with-webp"
Copy link
Member Author

Choose a reason for hiding this comment

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

I added these options in the configure call directly, I find this clearer

tar -xzf "zlib-${zlib_version}.tar.gz"

echo "-----> Downloading dependency libonig ${libonig_version}"
libzip_flag=""
Copy link
Member Author

Choose a reason for hiding this comment

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

This always empty

@Scalingo Scalingo deleted a comment from notion-workspace bot Sep 1, 2025
@EtienneM EtienneM marked this pull request as ready for review September 1, 2025 14:50
@EtienneM EtienneM requested review from a team and briceamen and removed request for a team September 1, 2025 14:51
Copy link

@briceamen briceamen left a comment

Choose a reason for hiding this comment

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

LGTM

@EtienneM EtienneM merged commit 91125dd into master Sep 2, 2025
4 checks passed
@EtienneM EtienneM deleted the feat/STORY-2477/scalingo-24-minimal branch September 2, 2025 07:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants