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

curl 8.6.0 #157

Merged
merged 8 commits into from
Jan 31, 2024
Merged

curl 8.6.0 #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2c1b39c
curl 8.6.0
GrahamCampbell Jan 31, 2024
53b79e9
Add libpsl
GrahamCampbell Jan 31, 2024
b3266fb
Fixes
GrahamCampbell Jan 31, 2024
289e20a
Fixes
GrahamCampbell Jan 31, 2024
2b44e3e
Revert "Fixes"
GrahamCampbell Jan 31, 2024
2b5db6a
Revert "Fixes"
GrahamCampbell Jan 31, 2024
149ab79
Derp
GrahamCampbell Jan 31, 2024
896d41f
Fixed download URL
GrahamCampbell Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion php-80/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,27 @@ RUN CFLAGS="" \
RUN make install


###############################################################################
# LIBPSL
# This adds support for the public suffix list in curl.
# https://github.com/rockdaboot/libpsl/releases
# Needed by:
# - curl
ENV VERSION_LIBPSL=0.21.5
ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl
RUN set -xe; \
mkdir -p ${LIBPSL_BUILD_DIR}; \
curl -Ls https://github.com/rockdaboot/libpsl/releases/download/${VERSION_LIBPSL}/libpsl-${VERSION_LIBPSL}.tar.gz \
| tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1
WORKDIR ${LIBPSL_BUILD_DIR}/
RUN CFLAGS="" \
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
./configure \
--prefix=${INSTALL_DIR}
RUN make -j $(nproc) && make install


###############################################################################
# CURL
# # https://github.com/curl/curl/releases
Expand All @@ -232,7 +253,7 @@ RUN make install
# # - libnghttp2
# # Needed by:
# # - php
ENV VERSION_CURL=8.5.0
ENV VERSION_CURL=8.6.0
ENV CURL_BUILD_DIR=${BUILD_DIR}/curl
RUN set -xe; \
mkdir -p ${CURL_BUILD_DIR}/bin; \
Expand Down
23 changes: 22 additions & 1 deletion php-81/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,27 @@ RUN CFLAGS="" \
RUN make install


###############################################################################
# LIBPSL
# This adds support for the public suffix list in curl.
# https://github.com/rockdaboot/libpsl/releases
# Needed by:
# - curl
ENV VERSION_LIBPSL=0.21.5
ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl
RUN set -xe; \
mkdir -p ${LIBPSL_BUILD_DIR}; \
curl -Ls https://github.com/rockdaboot/libpsl/releases/download/${VERSION_LIBPSL}/libpsl-${VERSION_LIBPSL}.tar.gz \
| tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1
WORKDIR ${LIBPSL_BUILD_DIR}/
RUN CFLAGS="" \
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
./configure \
--prefix=${INSTALL_DIR}
RUN make -j $(nproc) && make install


###############################################################################
# CURL
# # https://github.com/curl/curl/releases
Expand All @@ -233,7 +254,7 @@ RUN make install
# # - libnghttp2
# # Needed by:
# # - php
ENV VERSION_CURL=8.5.0
ENV VERSION_CURL=8.6.0
ENV CURL_BUILD_DIR=${BUILD_DIR}/curl
RUN set -xe; \
mkdir -p ${CURL_BUILD_DIR}/bin; \
Expand Down
23 changes: 22 additions & 1 deletion php-82/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,27 @@ RUN CFLAGS="" \
RUN make install


###############################################################################
# LIBPSL
# This adds support for the public suffix list in curl.
# https://github.com/rockdaboot/libpsl/releases
# Needed by:
# - curl
ENV VERSION_LIBPSL=0.21.5
ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl
RUN set -xe; \
mkdir -p ${LIBPSL_BUILD_DIR}; \
curl -Ls https://github.com/rockdaboot/libpsl/releases/download/${VERSION_LIBPSL}/libpsl-${VERSION_LIBPSL}.tar.gz \
| tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1
WORKDIR ${LIBPSL_BUILD_DIR}/
RUN CFLAGS="" \
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
./configure \
--prefix=${INSTALL_DIR}
RUN make -j $(nproc) && make install


###############################################################################
# CURL
# # https://github.com/curl/curl/releases
Expand All @@ -233,7 +254,7 @@ RUN make install
# # - libnghttp2
# # Needed by:
# # - php
ENV VERSION_CURL=8.5.0
ENV VERSION_CURL=8.6.0
ENV CURL_BUILD_DIR=${BUILD_DIR}/curl
RUN set -xe; \
mkdir -p ${CURL_BUILD_DIR}/bin; \
Expand Down
23 changes: 22 additions & 1 deletion php-83/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,27 @@ RUN CFLAGS="" \
RUN make install


###############################################################################
# LIBPSL
# This adds support for the public suffix list in curl.
# https://github.com/rockdaboot/libpsl/releases
# Needed by:
# - curl
ENV VERSION_LIBPSL=0.21.5
ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl
RUN set -xe; \
mkdir -p ${LIBPSL_BUILD_DIR}; \
curl -Ls https://github.com/rockdaboot/libpsl/releases/download/${VERSION_LIBPSL}/libpsl-${VERSION_LIBPSL}.tar.gz \
| tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1
WORKDIR ${LIBPSL_BUILD_DIR}/
RUN CFLAGS="" \
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
./configure \
--prefix=${INSTALL_DIR}
RUN make -j $(nproc) && make install


###############################################################################
# CURL
# # https://github.com/curl/curl/releases
Expand All @@ -233,7 +254,7 @@ RUN make install
# # - libnghttp2
# # Needed by:
# # - php
ENV VERSION_CURL=8.5.0
ENV VERSION_CURL=8.6.0
ENV CURL_BUILD_DIR=${BUILD_DIR}/curl
RUN set -xe; \
mkdir -p ${CURL_BUILD_DIR}/bin; \
Expand Down
Loading