ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: alpine ssl conflict

This commit is contained in:
Shao Yu-Lung (Allen) 2021-04-06 23:23:37 +08:00
parent b03547dbbe
commit 99cc94628c
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
php-worker/Dockerfile
View File

@ -32,15 +32,17 @@ RUN apk --update add wget \
cyrus-sasl-dev \ cyrus-sasl-dev \
libgsasl-dev \ libgsasl-dev \
oniguruma-dev \ oniguruma-dev \
openssl \ libressl \
openssl-dev \ libressl-dev \
supervisor supervisor
RUN docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml pcntl RUN pecl channel-update pecl.php.net; \
docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml pcntl
RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
pecl channel-update pecl.php.net && pecl install memcached-2.2.0 mcrypt-1.0.1 && docker-php-ext-enable memcached \ pecl install memcached-2.2.0 mcrypt-1.0.1 && docker-php-ext-enable memcached \
;else \ ;else \
pecl channel-update pecl.php.net && pecl install memcached mcrypt-1.0.1 && docker-php-ext-enable memcached \ pecl install memcached mcrypt-1.0.1 && docker-php-ext-enable memcached \
;fi ;fi
# Add a non-root user: # Add a non-root user:
@ -96,7 +98,6 @@ RUN set -eux; \
if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
apk add --update --no-cache imagemagick-dev; \ apk add --update --no-cache imagemagick-dev; \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
apk add --update --no-cache git && \
cd /tmp && \ cd /tmp && \
if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \ if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \
git clone https://github.com/Imagick/imagick; \ git clone https://github.com/Imagick/imagick; \
@ -251,7 +252,6 @@ RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \
ARG INSTALL_AMQP=false ARG INSTALL_AMQP=false
RUN if [ ${INSTALL_AMQP} = true ]; then \ RUN if [ ${INSTALL_AMQP} = true ]; then \
apk del -q openssl openssl-dev && \
apk --update add -q rabbitmq-c rabbitmq-c-dev && \ apk --update add -q rabbitmq-c rabbitmq-c-dev && \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
printf "\n" | pecl install amqp-1.11.0beta; \ printf "\n" | pecl install amqp-1.11.0beta; \
@ -260,7 +260,6 @@ RUN if [ ${INSTALL_AMQP} = true ]; then \
fi && \ fi && \
docker-php-ext-enable amqp && \ docker-php-ext-enable amqp && \
apk del -q rabbitmq-c-dev && \ apk del -q rabbitmq-c-dev && \
apk add --update -q openssl openssl-dev && \
docker-php-ext-install sockets \ docker-php-ext-install sockets \
;fi ;fi
@ -382,7 +381,7 @@ RUN if [ ${INSTALL_TAINT} = true ]; then \
ARG INSTALL_IMAP=false ARG INSTALL_IMAP=false
RUN if [ ${INSTALL_IMAP} = true ]; then \ RUN if [ ${INSTALL_IMAP} = true ]; then \
apk add --update imap-dev openssl-dev && \ apk add --update imap-dev && \
docker-php-ext-configure imap --with-imap --with-imap-ssl && \ docker-php-ext-configure imap --with-imap --with-imap-ssl && \
docker-php-ext-install imap \ docker-php-ext-install imap \
;fi ;fi