Skip to content

Commit

Permalink
Format the zlib install code like other sections
Browse files Browse the repository at this point in the history
  • Loading branch information
mnapoli committed Aug 31, 2023
1 parent c3e44c7 commit b2c6214
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 21 deletions.
7 changes: 0 additions & 7 deletions php-80/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,11 @@ RUN mkdir -p ${BUILD_DIR} \
# - xml2
ENV VERSION_ZLIB=1.3
ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib

RUN set -xe; \
mkdir -p ${ZLIB_BUILD_DIR}; \
# Download and upack the source code
curl -Ls https://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
| tar xJC ${ZLIB_BUILD_DIR} --strip-components=1

# Move into the unpackaged code directory
WORKDIR ${ZLIB_BUILD_DIR}/

# Configure the build
RUN set -xe; \
make distclean \
&& CFLAGS="" \
Expand All @@ -103,7 +97,6 @@ RUN set -xe; \
./configure \
--prefix=${INSTALL_DIR} \
--64

RUN set -xe; \
make install \
&& rm ${INSTALL_DIR}/lib/libz.a
Expand Down
7 changes: 0 additions & 7 deletions php-81/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,11 @@ RUN mkdir -p ${BUILD_DIR} \
# - xml2
ENV VERSION_ZLIB=1.3
ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib

RUN set -xe; \
mkdir -p ${ZLIB_BUILD_DIR}; \
# Download and upack the source code
curl -Ls https://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
| tar xJC ${ZLIB_BUILD_DIR} --strip-components=1

# Move into the unpackaged code directory
WORKDIR ${ZLIB_BUILD_DIR}/

# Configure the build
RUN set -xe; \
make distclean \
&& CFLAGS="" \
Expand All @@ -103,7 +97,6 @@ RUN set -xe; \
./configure \
--prefix=${INSTALL_DIR} \
--64

RUN set -xe; \
make install \
&& rm ${INSTALL_DIR}/lib/libz.a
Expand Down
7 changes: 0 additions & 7 deletions php-82/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,11 @@ RUN mkdir -p ${BUILD_DIR} \
# - xml2
ENV VERSION_ZLIB=1.3
ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib

RUN set -xe; \
mkdir -p ${ZLIB_BUILD_DIR}; \
# Download and upack the source code
curl -Ls https://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
| tar xJC ${ZLIB_BUILD_DIR} --strip-components=1

# Move into the unpackaged code directory
WORKDIR ${ZLIB_BUILD_DIR}/

# Configure the build
RUN set -xe; \
make distclean \
&& CFLAGS="" \
Expand All @@ -103,7 +97,6 @@ RUN set -xe; \
./configure \
--prefix=${INSTALL_DIR} \
--64

RUN set -xe; \
make install \
&& rm ${INSTALL_DIR}/lib/libz.a
Expand Down

0 comments on commit b2c6214

Please sign in to comment.