Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
laradock
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kerwin
laradock
Commits
b71f50bf
Commit
b71f50bf
authored
Jun 24, 2018
by
Abdelrahman Omran
Committed by
Shao Yu-Lung (Allen)
Jun 24, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix apt-get deprecated --force-yes flag & noninteractive if needed (#1640)
parent
7d1dc66f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
Dockerfile
php-fpm/Dockerfile
+1
-1
Dockerfile
workspace/Dockerfile
+6
-3
No files found.
php-fpm/Dockerfile
View file @
b71f50bf
...
...
@@ -417,7 +417,7 @@ USER root
ARG
INSTALL_IMAGE_OPTIMIZERS=false
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
###########################################################################
...
...
workspace/Dockerfile
View file @
b71f50bf
...
...
@@ -18,6 +18,9 @@ FROM laradock/workspace:2.2-${PHP_VERSION}
LABEL
maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
# Set Environment Variables
ENV
DEBIAN_FRONTEND noninteractive
# Start as root
USER
root
...
...
@@ -230,7 +233,7 @@ ARG PHP_VERSION=${PHP_VERSION}
RUN if
[
${
INSTALL_XDEBUG
}
=
true
]
;
then
\
# 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 && \
echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/vendor/bin/phpunit'" >> ~/.bashrc \
;fi
...
...
@@ -656,7 +659,7 @@ USER root
ARG
INSTALL_IMAGE_OPTIMIZERS=false
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
\
.
~/.bashrc
&&
npm
install
-g
svgo
\
;
fi
\
...
...
@@ -705,7 +708,7 @@ USER root
ARG
INSTALL_IMAGEMAGICK=false
RUN if
[
${
INSTALL_IMAGEMAGICK
}
=
true
]
;
then
\
apt-get
install
-y
--force-yes
imagemagick php-imagick
\
apt-get
install
-y
imagemagick php-imagick
\
;
fi
###########################################################################
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment