Skip to content

Commit

Permalink
Merge branch 'fix-iconv' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@timkelty
timkelty committed Aug 3, 2021
2 parents 7149c1e + 8e939d4 commit 57374c9
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 4 deletions.
6 changes: 6 additions & 0 deletions 7.0/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
ARG PHP_VERSION
ARG PROJECT_TYPE

FROM alpine:3.13 AS iconv-build
RUN apk add --no-cache gnu-libiconv

FROM php:${PHP_VERSION}-${PROJECT_TYPE}-alpine

# setup general options for environment variables
Expand Down Expand Up @@ -77,6 +80,9 @@ RUN set -ex && \
make \
imagemagick-dev

# https://github.com/craftcms/docker/issues/16
COPY --from=iconv-build /usr/lib/preloadable_libiconv.so /usr/lib/preloadable_libiconv.so

# https://github.com/docker-library/php/issues/1121
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so

Expand Down
6 changes: 6 additions & 0 deletions 7.1/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
ARG PHP_VERSION
ARG PROJECT_TYPE

FROM alpine:3.13 AS iconv-build
RUN apk add --no-cache gnu-libiconv

FROM php:${PHP_VERSION}-${PROJECT_TYPE}-alpine

# setup general options for environment variables
Expand Down Expand Up @@ -77,6 +80,9 @@ RUN set -ex && \
make \
imagemagick-dev

# https://github.com/craftcms/docker/issues/16
COPY --from=iconv-build /usr/lib/preloadable_libiconv.so /usr/lib/preloadable_libiconv.so

# https://github.com/docker-library/php/issues/1121
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so

Expand Down
7 changes: 6 additions & 1 deletion 7.2/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
ARG PHP_VERSION
ARG PROJECT_TYPE

FROM alpine:3.13 AS iconv-build
RUN apk add --no-cache gnu-libiconv

FROM php:${PHP_VERSION}-${PROJECT_TYPE}-alpine

# setup general options for environment variables
Expand Down Expand Up @@ -41,7 +44,6 @@ RUN set -ex && \
g++ \
make \
freetype \
# gnu-libiconv=1.15-r3 \
libzip-dev \
libpng \
libjpeg-turbo \
Expand Down Expand Up @@ -78,6 +80,9 @@ RUN set -ex && \
make \
imagemagick-dev

# https://github.com/craftcms/docker/issues/16
COPY --from=iconv-build /usr/lib/preloadable_libiconv.so /usr/lib/preloadable_libiconv.so

# https://github.com/docker-library/php/issues/1121
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so

Expand Down
7 changes: 6 additions & 1 deletion 7.3/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
ARG PHP_VERSION
ARG PROJECT_TYPE

FROM alpine:3.13 AS iconv-build
RUN apk add --no-cache gnu-libiconv

FROM php:${PHP_VERSION}-${PROJECT_TYPE}-alpine

# setup general options for environment variables
Expand Down Expand Up @@ -45,7 +48,6 @@ RUN set -ex && \
libpng \
libjpeg-turbo \
freetype-dev \
gnu-libiconv=1.15-r3 \
libpng-dev \
libjpeg-turbo-dev \
libxml2-dev \
Expand Down Expand Up @@ -78,6 +80,9 @@ RUN set -ex && \
make \
imagemagick-dev

# https://github.com/craftcms/docker/issues/16
COPY --from=iconv-build /usr/lib/preloadable_libiconv.so /usr/lib/preloadable_libiconv.so

# https://github.com/docker-library/php/issues/1121
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so

Expand Down
7 changes: 6 additions & 1 deletion 7.4/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
ARG PHP_VERSION
ARG PROJECT_TYPE

FROM alpine:3.13 AS iconv-build
RUN apk add --no-cache gnu-libiconv

FROM php:${PHP_VERSION}-${PROJECT_TYPE}-alpine

# setup general options for environment variables
Expand Down Expand Up @@ -45,7 +48,6 @@ RUN set -ex && \
libpng \
libjpeg-turbo \
freetype-dev \
gnu-libiconv=1.15-r3 \
libpng-dev \
libjpeg-turbo-dev \
libxml2-dev \
Expand Down Expand Up @@ -78,6 +80,9 @@ RUN set -ex && \
make \
imagemagick-dev

# https://github.com/craftcms/docker/issues/16
COPY --from=iconv-build /usr/lib/preloadable_libiconv.so /usr/lib/preloadable_libiconv.so

# https://github.com/docker-library/php/issues/1121
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so

Expand Down
8 changes: 7 additions & 1 deletion 8.0/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
ARG PHP_VERSION
ARG PROJECT_TYPE

FROM alpine:3.13 AS iconv-build
RUN apk add --no-cache gnu-libiconv

FROM php:${PHP_VERSION}-${PROJECT_TYPE}-alpine

# setup general options for environment variables
Expand Down Expand Up @@ -42,7 +45,7 @@ RUN set -ex && \
g++ \
make \
freetype \
gnu-libiconv=1.15-r3 \
gnu-libiconv \
libzip-dev \
libpng \
libjpeg-turbo \
Expand Down Expand Up @@ -75,6 +78,9 @@ RUN set -ex && \
g++ \
make

# https://github.com/craftcms/docker/issues/16
COPY --from=iconv-build /usr/lib/preloadable_libiconv.so /usr/lib/preloadable_libiconv.so

# https://github.com/docker-library/php/issues/1121
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so

Expand Down

0 comments on commit 57374c9

Please sign in to comment.