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

Ensure PHP extension directory exists #52

Merged
merged 1 commit into from
Mar 21, 2022
Merged

Ensure PHP extension directory exists #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions Dockerfiles/Dockerfile.jessie
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ RUN set -eux \
### Copy PHP scripts and patches
###
COPY data/docker-php-source /usr/local/bin/
COPY data/php-${PHP_VERSION}*.patch /tmp/
COPY data/php/php-${PHP_VERSION}.tar.xz /usr/src/php.tar.xz
COPY data/php/php-${PHP_VERSION}*.patch /tmp/


###
Expand All @@ -140,17 +141,14 @@ RUN set -eux \
apt-get install -y --no-install-recommends --no-install-suggests \
${BUILD_TOOLS_32}; \
fi \
# Fetch PHP
&& curl -sS -k -L --fail "http://museum.php.net/php5/php-${PHP_VERSION}.tar.gz" -o /usr/src/php.tar.gz \
# Extract artifacts
&& tar -xf /usr/src/php.tar.gz -C /usr/src/php --strip-components=1 \
# Apply patches
# Extract and apply patches
&& docker-php-source extract \
&& cd /usr/src/php \
&& patch -p1 < /tmp/php-${PHP_VERSION}-libxml2.patch \
&& patch -p1 < /tmp/php-${PHP_VERSION}-openssl.patch \
&& patch -p1 < /tmp/php-${PHP_VERSION}-fpm.patch \
&& (patch -p0 < /tmp/php-${PHP_VERSION}-curl.patch || true) \
# Create php.tar.xz
# Create new php.tar.xz
&& cd /usr/src \
&& tar -cJf php.tar.xz php \
&& rm -rf php php.tar.gz \
Expand Down Expand Up @@ -212,7 +210,9 @@ RUN set -eux \
${PHP_RUNTIME_DEPS} \
${RUNTIME_TOOLS} \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/* \
# Setup extension dir
&& mkdir -p "$(php -r 'echo ini_get("extension_dir");')"


COPY data/docker-php-* /usr/local/bin/
Expand Down
16 changes: 8 additions & 8 deletions Dockerfiles/Dockerfile.stretch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ RUN set -eux \
### Copy PHP scripts and patches
###
COPY data/docker-php-source /usr/local/bin/
COPY data/php-${PHP_VERSION}*.patch /tmp/
COPY data/php/php-${PHP_VERSION}.tar.xz /usr/src/php.tar.xz
COPY data/php/php-${PHP_VERSION}*.patch /tmp/


###
Expand All @@ -142,17 +143,14 @@ RUN set -eux \
apt-get install -y --no-install-recommends --no-install-suggests \
${BUILD_TOOLS_32}; \
fi \
# Fetch PHP
&& curl -sS -k -L --fail "http://museum.php.net/php5/php-${PHP_VERSION}.tar.gz" -o /usr/src/php.tar.gz \
# Extract artifacts
&& tar -xf /usr/src/php.tar.gz -C /usr/src/php --strip-components=1 \
# Apply patches
# Extract and apply patches
&& docker-php-source extract \
&& cd /usr/src/php \
&& patch -p1 < /tmp/php-${PHP_VERSION}-libxml2.patch \
&& patch -p1 < /tmp/php-${PHP_VERSION}-openssl.patch \
&& patch -p1 < /tmp/php-${PHP_VERSION}-fpm.patch \
&& (patch -p0 < /tmp/php-${PHP_VERSION}-curl.patch || true) \
# Create php.tar.xz
# Create new php.tar.xz
&& cd /usr/src \
&& tar -cJf php.tar.xz php \
&& rm -rf php php.tar.gz \
Expand Down Expand Up @@ -217,7 +215,9 @@ RUN set -eux \
${PHP_RUNTIME_DEPS} \
${RUNTIME_TOOLS} \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/* \
# Setup extension dir
&& mkdir -p "$(php -r 'echo ini_get("extension_dir");')"


COPY data/docker-php-* /usr/local/bin/
Expand Down
51 changes: 0 additions & 51 deletions Dockerfiles/data/php-5.1.6-curl.patch
View file
Open in desktop

This file was deleted.

Loading