Merge pull request #19 from phanirithvij/dockerfile-changes

keep dockerfiles consitent

Dockerfile

@@ -61,7 +61,7 @@ COPY --from=builder vnstat-*/examples/vnstat-metrics.cgi /var/www/localhost/htdo
 
 RUN true \
     && set -ex \
-    && addgroup -S vnstat  \
+    && addgroup -S vnstat \
     && adduser -S -h /var/lib/vnstat -s /sbin/nologin -g vnStat -D -H -G vnstat vnstat
 
 VOLUME /var/lib/vnstat

Dockerfile-dev

@@ -18,7 +18,7 @@ ENV INDEX_IMAGE_OUTPUT=hs
 ENV RUN_VNSTATD=1
 
 COPY favicon.ico /var/www/localhost/htdocs/favicon.ico
-COPY start.sh /start.sh
+COPY start.sh /
 
 RUN true \
     && set -ex \
@@ -42,8 +42,8 @@ RUN true \
         gd-dev \
         sqlite-dev \
         git \
-    && git clone --depth 1 https://github.com/vergoh/vnstat \
-    && cd vnstat \
+    && git clone --depth 1 https://github.com/vergoh/vnstat vnstat-master \
+    && cd vnstat-*/ \
     && ./configure --prefix=/usr --sysconfdir=/etc \
     && make \
     && make install
@@ -55,9 +55,9 @@ COPY --from=builder /usr/bin/vnstat /usr/bin/vnstat
 COPY --from=builder /usr/bin/vnstati /usr/bin/vnstati
 COPY --from=builder /usr/sbin/vnstatd /usr/sbin/vnstatd
 COPY --from=builder /etc/vnstat.conf /etc/vnstat.conf
-COPY --from=builder vnstat/examples/vnstat.cgi /var/www/localhost/htdocs/index.cgi
-COPY --from=builder vnstat/examples/vnstat-json.cgi /var/www/localhost/htdocs/json.cgi
-COPY --from=builder vnstat/examples/vnstat-metrics.cgi /var/www/localhost/htdocs/metrics.cgi
+COPY --from=builder vnstat-*/examples/vnstat.cgi /var/www/localhost/htdocs/index.cgi
+COPY --from=builder vnstat-*/examples/vnstat-json.cgi /var/www/localhost/htdocs/json.cgi
+COPY --from=builder vnstat-*/examples/vnstat-metrics.cgi /var/www/localhost/htdocs/metrics.cgi
 
 RUN true \
     && set -ex \