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
0f8891b5
Unverified
Commit
0f8891b5
authored
Apr 04, 2018
by
Mahmoud Zalt
Committed by
GitHub
Apr 04, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1464 from danhunsaker/copy-vs-add
Apply COPY vs ADD best practices
parents
ebeb9e43
31a4e29c
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
24 additions
and
24 deletions
+24
-24
Dockerfile
aerospike/Dockerfile
+1
-1
Dockerfile
hhvm/Dockerfile
+1
-1
Dockerfile
mariadb/Dockerfile
+1
-1
Dockerfile
mysql/Dockerfile
+1
-1
Dockerfile
nginx/Dockerfile
+1
-1
Dockerfile
percona/Dockerfile
+1
-1
Dockerfile-56
php-fpm/Dockerfile-56
+2
-2
Dockerfile-70
php-fpm/Dockerfile-70
+2
-2
Dockerfile-71
php-fpm/Dockerfile-71
+2
-2
Dockerfile-72
php-fpm/Dockerfile-72
+2
-2
Dockerfile
varnish/Dockerfile
+2
-2
Dockerfile-56
workspace/Dockerfile-56
+2
-2
Dockerfile-70
workspace/Dockerfile-70
+2
-2
Dockerfile-71
workspace/Dockerfile-71
+2
-2
Dockerfile-72
workspace/Dockerfile-72
+2
-2
No files found.
aerospike/Dockerfile
View file @
0f8891b5
...
...
@@ -4,4 +4,4 @@ LABEL maintainer="Luciano Jr <luciano@lucianojr.com.br>"
RUN
rm
/etc/aerospike/aerospike.conf
ADD
aerospike.conf /etc/aerospike/aerospike.conf
COPY
aerospike.conf /etc/aerospike/aerospike.conf
hhvm/Dockerfile
View file @
0f8891b5
...
...
@@ -15,7 +15,7 @@ RUN apt-get update -y \
RUN
mkdir
-p
/var/www
ADD
server.ini /etc/hhvm/server.ini
COPY
server.ini /etc/hhvm/server.ini
RUN
usermod
-u
1000 www-data
...
...
mariadb/Dockerfile
View file @
0f8891b5
...
...
@@ -2,7 +2,7 @@ FROM mariadb:latest
LABEL
maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
ADD
my.cnf /etc/mysql/conf.d/my.cnf
COPY
my.cnf /etc/mysql/conf.d/my.cnf
CMD
["mysqld"]
...
...
mysql/Dockerfile
View file @
0f8891b5
...
...
@@ -13,7 +13,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
RUN
chown
-R
mysql:root /var/lib/mysql/
ADD
my.cnf /etc/mysql/conf.d/my.cnf
COPY
my.cnf /etc/mysql/conf.d/my.cnf
CMD
["mysqld"]
...
...
nginx/Dockerfile
View file @
0f8891b5
...
...
@@ -2,7 +2,7 @@ FROM nginx:alpine
LABEL
maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
ADD
nginx.conf /etc/nginx/
COPY
nginx.conf /etc/nginx/
# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
...
...
percona/Dockerfile
View file @
0f8891b5
...
...
@@ -4,7 +4,7 @@ LABEL maintainer="DTUNES <diegotdai@gmai.com>"
RUN
chown
-R
mysql:root /var/lib/mysql/
ADD
my.cnf /etc/mysql/conf.d/my.cnf
COPY
my.cnf /etc/mysql/conf.d/my.cnf
CMD
["mysqld"]
...
...
php-fpm/Dockerfile-56
View file @
0f8891b5
...
...
@@ -358,8 +358,8 @@ RUN php -v | head -n 1 | grep -q "PHP 5.6."
#--------------------------------------------------------------------------
#
ADD
./laravel.ini /usr/local/etc/php/conf.d
ADD
./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
COPY
./laravel.ini /usr/local/etc/php/conf.d
COPY
./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
#RUN rm -r /var/lib/apt/lists/*
...
...
php-fpm/Dockerfile-70
View file @
0f8891b5
...
...
@@ -380,8 +380,8 @@ RUN php -v | head -n 1 | grep -q "PHP 7.0."
#--------------------------------------------------------------------------
#
ADD
./laravel.ini /usr/local/etc/php/conf.d/
ADD
./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
COPY
./laravel.ini /usr/local/etc/php/conf.d/
COPY
./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
#RUN rm -r /var/lib/apt/lists/*
...
...
php-fpm/Dockerfile-71
View file @
0f8891b5
...
...
@@ -380,8 +380,8 @@ RUN php -v | head -n 1 | grep -q "PHP 7.1."
#--------------------------------------------------------------------------
#
ADD
./laravel.ini /usr/local/etc/php/conf.d
ADD
./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
COPY
./laravel.ini /usr/local/etc/php/conf.d
COPY
./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
#RUN rm -r /var/lib/apt/lists/*
...
...
php-fpm/Dockerfile-72
View file @
0f8891b5
...
...
@@ -383,8 +383,8 @@ RUN php -v | head -n 1 | grep -q "PHP 7.2."
#--------------------------------------------------------------------------
#
ADD
./laravel.ini /usr/local/etc/php/conf.d
ADD
./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
COPY
./laravel.ini /usr/local/etc/php/conf.d
COPY
./xlaravel.pool.conf /usr/local/etc/php-fpm.d/
#RUN rm -r /var/lib/apt/lists/*
...
...
varnish/Dockerfile
View file @
0f8891b5
...
...
@@ -19,8 +19,8 @@ ENV VARNISH_PORT 6081
ENV
BACKEND_HOST localhost
ENV
BACKEND_PORT 80
ADD
default.vcl /etc/varnish/default.vcl
ADD
start.sh /etc/varnish/start.sh
COPY
default.vcl /etc/varnish/default.vcl
COPY
start.sh /etc/varnish/start.sh
RUN
chmod
+x /etc/varnish/start.sh
...
...
workspace/Dockerfile-56
View file @
0f8891b5
...
...
@@ -209,8 +209,8 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \
ARG INSTALL_WORKSPACE_SSH=false
ENV INSTALL_WORKSPACE_SSH ${INSTALL_WORKSPACE_SSH}
ADD
insecure_id_rsa /tmp/id_rsa
ADD
insecure_id_rsa.pub /tmp/id_rsa.pub
COPY
insecure_id_rsa /tmp/id_rsa
COPY
insecure_id_rsa.pub /tmp/id_rsa.pub
RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \
rm -f /etc/service/sshd/down && \
...
...
workspace/Dockerfile-70
View file @
0f8891b5
...
...
@@ -206,8 +206,8 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \
ARG INSTALL_WORKSPACE_SSH=false
ENV INSTALL_WORKSPACE_SSH ${INSTALL_WORKSPACE_SSH}
ADD
insecure_id_rsa /tmp/id_rsa
ADD
insecure_id_rsa.pub /tmp/id_rsa.pub
COPY
insecure_id_rsa /tmp/id_rsa
COPY
insecure_id_rsa.pub /tmp/id_rsa.pub
RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \
rm -f /etc/service/sshd/down && \
...
...
workspace/Dockerfile-71
View file @
0f8891b5
...
...
@@ -202,8 +202,8 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \
ARG INSTALL_WORKSPACE_SSH=false
ENV INSTALL_WORKSPACE_SSH ${INSTALL_WORKSPACE_SSH}
ADD
insecure_id_rsa /tmp/id_rsa
ADD
insecure_id_rsa.pub /tmp/id_rsa.pub
COPY
insecure_id_rsa /tmp/id_rsa
COPY
insecure_id_rsa.pub /tmp/id_rsa.pub
RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \
rm -f /etc/service/sshd/down && \
...
...
workspace/Dockerfile-72
View file @
0f8891b5
...
...
@@ -203,8 +203,8 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \
ARG INSTALL_WORKSPACE_SSH=false
ENV INSTALL_WORKSPACE_SSH ${INSTALL_WORKSPACE_SSH}
ADD
insecure_id_rsa /tmp/id_rsa
ADD
insecure_id_rsa.pub /tmp/id_rsa.pub
COPY
insecure_id_rsa /tmp/id_rsa
COPY
insecure_id_rsa.pub /tmp/id_rsa.pub
RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \
rm -f /etc/service/sshd/down && \
...
...
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