Apply COPY vs ADD best practices

danhunsaker · danhunsaker · commit 31a4e29c819a · 2018-04-04T06:13:28.000-06:00
Should only use `ADD` for URLs (and even then, `curl` or `wget` are preferred, for numerous reasons, even within this repo) and when extracting archive contents as part of the `ADD` operation; otherwise `COPY` is clearer and (slightly) more efficient.
diff --git a/aerospike/Dockerfile b/aerospike/Dockerfile
@@ -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
diff --git a/hhvm/Dockerfile b/hhvm/Dockerfile
@@ -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
 
diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile
@@ -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"]
 
diff --git a/mysql/Dockerfile b/mysql/Dockerfile
@@ -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"]
 
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
@@ -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.
 
diff --git a/percona/Dockerfile b/percona/Dockerfile
@@ -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"]
 
diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56
@@ -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/*
 
diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70
@@ -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/*
 
diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71
@@ -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/*
 
diff --git a/php-fpm/Dockerfile-72 b/php-fpm/Dockerfile-72
@@ -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/*
 
diff --git a/varnish/Dockerfile b/varnish/Dockerfile
@@ -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
 
diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56
@@ -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 && \
diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70
@@ -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 && \
diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71
@@ -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 && \
diff --git a/workspace/Dockerfile-72 b/workspace/Dockerfile-72
@@ -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 && \

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ LABEL maintainer="Luciano Jr <luciano@lucianojr.com.br>"`
`4`	`4`
`5`	`5`	`RUN rm /etc/aerospike/aerospike.conf`
`6`	`6`
`7`		`-ADD aerospike.conf /etc/aerospike/aerospike.conf`
	`7`	`+COPY aerospike.conf /etc/aerospike/aerospike.conf`
Original file line number	Diff line number	Diff line change
`@@ -358,8 +358,8 @@ RUN php -v \| head -n 1 \| grep -q "PHP 5.6."`
`358`	`358`	`#--------------------------------------------------------------------------`
`359`	`359`	`#`
`360`	`360`
`361`		`-ADD ./laravel.ini /usr/local/etc/php/conf.d`
`362`		`-ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/`
	`361`	`+COPY ./laravel.ini /usr/local/etc/php/conf.d`
	`362`	`+COPY ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/`
`363`	`363`
`364`	`364`	`#RUN rm -r /var/lib/apt/lists/*`
`365`	`365`
Original file line number	Diff line number	Diff line change
`@@ -380,8 +380,8 @@ RUN php -v \| head -n 1 \| grep -q "PHP 7.0."`
`380`	`380`	`#--------------------------------------------------------------------------`
`381`	`381`	`#`
`382`	`382`
`383`		`-ADD ./laravel.ini /usr/local/etc/php/conf.d/`
`384`		`-ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/`
	`383`	`+COPY ./laravel.ini /usr/local/etc/php/conf.d/`
	`384`	`+COPY ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/`
`385`	`385`
`386`	`386`	`#RUN rm -r /var/lib/apt/lists/*`
`387`	`387`
Original file line number	Diff line number	Diff line change
`@@ -383,8 +383,8 @@ RUN php -v \| head -n 1 \| grep -q "PHP 7.2."`
`383`	`383`	`#--------------------------------------------------------------------------`
`384`	`384`	`#`
`385`	`385`
`386`		`-ADD ./laravel.ini /usr/local/etc/php/conf.d`
`387`		`-ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/`
	`386`	`+COPY ./laravel.ini /usr/local/etc/php/conf.d`
	`387`	`+COPY ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/`
`388`	`388`
`389`	`389`	`#RUN rm -r /var/lib/apt/lists/*`
`390`	`390`