From e5434d77d0e411fbe16cc5a6765034f1a0d8fd9d Mon Sep 17 00:00:00 2001 From: puneetse <22071208+puneetse@users.noreply.github.com> Date: Tue, 30 Apr 2019 16:11:45 -0700 Subject: [PATCH] Moving COPY higher in the nginx Dockerfile Moving COPY higher in the Dockerfile makes the docker build fail faster if there is an error. No need to create /etc/nginx/conf.d/ manually. --- nginx/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nginx/Dockerfile b/nginx/Dockerfile index f1c73e9..1992cae 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,6 +1,8 @@ FROM clearlinux:latest MAINTAINER bin.yang@intel.com +COPY default.conf /etc/nginx/conf.d/default.conf + RUN swupd update $swupd_args && \ swupd bundle-add nginx $swupd_args RUN rm -rf /var/lib/swupd @@ -11,9 +13,8 @@ RUN ln -sf /dev/stdout /var/log/nginx/access.log \ && ln -sf /dev/stderr /var/log/nginx/error.log RUN mkdir -p /var/lib/nginx/ -RUN mkdir -p /etc/nginx/conf.d RUN cp -f /usr/share/nginx/conf/nginx.conf.example /etc/nginx/nginx.conf -COPY default.conf /etc/nginx/conf.d/default.conf + VOLUME /usr/share/nginx/html EXPOSE 80