From 27cc2c7922c76aed3c0234cf041a0259555e6094 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 23 Jan 2019 23:07:58 +0900 Subject: [PATCH 1/2] fix codacy issues with Dockerfile --- docker/Dockerfile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 2fcec7ef..0f23bb00 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM centos +FROM centos:7 ENV GOSU_VERSION=1.11 RUN yum install -y make git gcc libcurl-devel sqlite-devel && \ @@ -15,12 +15,11 @@ RUN yum install -y make git gcc libcurl-devel sqlite-devel && \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true RUN mkdir -p /onedrive/conf /onedrive/data -ADD onedrive /usr/src/onedrive -RUN . `bash install.sh -a` && \ - cd /usr/src/onedrive && \ - make install.noservice && \ - make clean -ADD entrypoint.sh /entrypoint.sh +COPY onedrive /usr/src/onedrive +RUN . "`bash install.sh -a`" && \ + make -C /usr/src/onedrive install.noservice && \ + make -C /usr/src/onedrive clean +COPY entrypoint.sh /entrypoint.sh VOLUME ["/onedrive/conf"] ENTRYPOINT ["/entrypoint.sh"] From 10475c9d2ca86891082f5b053ed267e7ce5b1821 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 24 Jan 2019 08:54:48 +0900 Subject: [PATCH 2/2] more codacy issues --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 0f23bb00..5a249d3f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,7 +16,7 @@ RUN yum install -y make git gcc libcurl-devel sqlite-devel && \ && gosu nobody true RUN mkdir -p /onedrive/conf /onedrive/data COPY onedrive /usr/src/onedrive -RUN . "`bash install.sh -a`" && \ +RUN . "$(bash install.sh -a)" && \ make -C /usr/src/onedrive install.noservice && \ make -C /usr/src/onedrive clean COPY entrypoint.sh /entrypoint.sh