Skip to content

Commit

Permalink
Utilize buildkit concurrency
Browse files Browse the repository at this point in the history
  • Loading branch information
WyriHaximus committed Jan 23, 2020
1 parent 2ffb119 commit 730aa15
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions Dockerfile-nts
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ COPY src/php/conf/ /usr/local/etc/php/conf.d/
COPY src/php/cli/conf/*.ini /usr/local/etc/php/conf.d/

RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` && \
mv /*.so "$EXTENSION_DIR/" && \
apk update && \
mv /*.so "$EXTENSION_DIR/"
RUN apk update && \
apk add --no-cache \
freetype-dev \
libjpeg-turbo-dev \
Expand All @@ -75,15 +75,16 @@ RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` && \
$PHPIZE_DEPS \
&& if [ $(php -v | grep 7.4 | wc -l) != 0 ] ; then docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/; else docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/; fi \
&& docker-php-ext-install -j$(nproc) gd pcntl pgsql pdo pdo_pgsql bcmath zip gmp iconv \
&& pecl install vips \
&& docker-php-ext-enable uv \
&& docker-php-ext-enable vips \
&& apk del $PHPIZE_DEPS \
&& wget -O - https://raw.githubusercontent.com/eficode/wait-for/master/wait-for > /bin/wait-for \
&& chmod +x /bin/wait-for \
&& rm -rf /var/cache/apk/* \
&& rm -rf /tmp/* \
&& rm -rf /usr/lib/python*
RUN pecl install vips \
&& docker-php-ext-enable vips

RUN docker-php-ext-enable uv
RUN apk del $PHPIZE_DEPS
RUN wget -O - https://raw.githubusercontent.com/eficode/wait-for/master/wait-for > /bin/wait-for \
&& chmod +x /bin/wait-for
RUN rm -rf /var/cache/apk/*
RUN rm -rf /tmp/*
RUN rm -rf /usr/lib/python*

# Install shush
COPY src/php/utils/install-shush /usr/local/bin/
Expand Down

0 comments on commit 730aa15

Please sign in to comment.