Commit b71f50bf authored by Abdelrahman Omran's avatar Abdelrahman Omran Committed by Shao Yu-Lung (Allen)

Fix apt-get deprecated --force-yes flag & noninteractive if needed (#1640)

parent 7d1dc66f
...@@ -417,7 +417,7 @@ USER root ...@@ -417,7 +417,7 @@ USER root
ARG INSTALL_IMAGE_OPTIMIZERS=false ARG INSTALL_IMAGE_OPTIMIZERS=false
RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \
apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle \ apt-get install -y jpegoptim optipng pngquant gifsicle \
;fi ;fi
########################################################################### ###########################################################################
......
...@@ -18,6 +18,9 @@ FROM laradock/workspace:2.2-${PHP_VERSION} ...@@ -18,6 +18,9 @@ FROM laradock/workspace:2.2-${PHP_VERSION}
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>" LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
# Set Environment Variables
ENV DEBIAN_FRONTEND noninteractive
# Start as root # Start as root
USER root USER root
...@@ -230,7 +233,7 @@ ARG PHP_VERSION=${PHP_VERSION} ...@@ -230,7 +233,7 @@ ARG PHP_VERSION=${PHP_VERSION}
RUN if [ ${INSTALL_XDEBUG} = true ]; then \ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
# Load the xdebug extension only with phpunit commands # Load the xdebug extension only with phpunit commands
apt-get install -y --force-yes php${PHP_VERSION}-xdebug && \ apt-get install -y php${PHP_VERSION}-xdebug && \
sed -i 's/^;//g' /etc/php/${PHP_VERSION}/cli/conf.d/20-xdebug.ini && \ sed -i 's/^;//g' /etc/php/${PHP_VERSION}/cli/conf.d/20-xdebug.ini && \
echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/vendor/bin/phpunit'" >> ~/.bashrc \ echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/vendor/bin/phpunit'" >> ~/.bashrc \
;fi ;fi
...@@ -656,7 +659,7 @@ USER root ...@@ -656,7 +659,7 @@ USER root
ARG INSTALL_IMAGE_OPTIMIZERS=false ARG INSTALL_IMAGE_OPTIMIZERS=false
RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \
apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle && \ apt-get install -y jpegoptim optipng pngquant gifsicle && \
if [ ${INSTALL_NODE} = true ]; then \ if [ ${INSTALL_NODE} = true ]; then \
. ~/.bashrc && npm install -g svgo \ . ~/.bashrc && npm install -g svgo \
;fi\ ;fi\
...@@ -705,7 +708,7 @@ USER root ...@@ -705,7 +708,7 @@ USER root
ARG INSTALL_IMAGEMAGICK=false ARG INSTALL_IMAGEMAGICK=false
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
apt-get install -y --force-yes imagemagick php-imagick \ apt-get install -y imagemagick php-imagick \
;fi ;fi
########################################################################### ###########################################################################
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment