From ada3665ba01c6f5942e1930d7ac8cce2615d5c20 Mon Sep 17 00:00:00 2001 From: Jason Kulatunga Date: Tue, 27 Oct 2020 07:18:47 -0700 Subject: [PATCH] fix #111 fix #109 --- docker/Dockerfile | 5 ++++- docker/Dockerfile.web | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 4da8630..43dc873 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -49,6 +49,9 @@ RUN chmod +x /scrutiny/bin/scrutiny && \ chmod +x /scrutiny/bin/scrutiny-collector-metrics && \ mkdir -p /scrutiny/web && \ mkdir -p /scrutiny/config && \ - mkdir -p /scrutiny/jobber + mkdir -p /scrutiny/jobber && \ + chmod -R ugo+rwx /scrutiny/config && \ + chmod -R ugo+rwx /scrutiny/jobber + CMD ["/init"] diff --git a/docker/Dockerfile.web b/docker/Dockerfile.web index aa42cfa..c9174a7 100644 --- a/docker/Dockerfile.web +++ b/docker/Dockerfile.web @@ -29,9 +29,12 @@ EXPOSE 8080 WORKDIR /scrutiny ENV PATH="/scrutiny/bin:${PATH}" +RUN apt-get update && apt-get install -y ca-certificates curl && update-ca-certificates + COPY --from=backendbuild /go/src/github.com/analogj/scrutiny/scrutiny /scrutiny/bin/ COPY --from=frontendbuild /scrutiny/dist /scrutiny/web RUN chmod +x /scrutiny/bin/scrutiny && \ mkdir -p /scrutiny/web && \ - mkdir -p /scrutiny/config + mkdir -p /scrutiny/config && \ + chmod -R ugo+rwx /scrutiny/config CMD ["/scrutiny/bin/scrutiny", "start"]