gilles/scrutiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove s6-overlay from individual docker images.

Browse Source
This commit is contained in:
Jason Kulatunga
2020-08-20 20:23:14 -07:00
parent 704c65f1f4
commit e0fd56f0f1
2 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile.collector
+1 -6
View File
@@ -20,11 +20,6 @@ RUN apt install /tmp/jobber_1.4.4-1_amd64.deb
RUN apt-get update && apt-get install -y smartmontools=7.0-0ubuntu1~ubuntu18.04.1 RUN apt-get update && apt-get install -y smartmontools=7.0-0ubuntu1~ubuntu18.04.1
ADD https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-amd64.tar.gz /tmp/
RUN tar xzf /tmp/s6-overlay-amd64.tar.gz -C / && \
mkdir -p /rootfs/etc/services.d/jobber
COPY /rootfs/etc/services.d/jobber /etc/services.d/jobber
COPY /rootfs/scrutiny /scrutiny COPY /rootfs/scrutiny /scrutiny
@@ -33,4 +28,4 @@ COPY --from=backendbuild /go/src/github.com/analogj/scrutiny/scrutiny-collector-
RUN chmod +x /scrutiny/bin/scrutiny-collector-selftest && \ RUN chmod +x /scrutiny/bin/scrutiny-collector-selftest && \
chmod +x /scrutiny/bin/scrutiny-collector-metrics chmod +x /scrutiny/bin/scrutiny-collector-metrics
CMD ["/init"] CMD ["/usr/lib/x86_64-linux-gnu/jobberrunner", "/scrutiny/config/jobber.yaml"]
Dockerfile.web
+2 -18
View File
@@ -29,25 +29,9 @@ EXPOSE 8080
WORKDIR /scrutiny WORKDIR /scrutiny
ENV PATH="/scrutiny/bin:${PATH}" ENV PATH="/scrutiny/bin:${PATH}"
ADD https://github.com/dshearer/jobber/releases/download/v1.4.4/jobber_1.4.4-1_amd64.deb /tmp/
RUN apt install /tmp/jobber_1.4.4-1_amd64.deb
RUN apt-get update && apt-get install -y smartmontools=7.0-0ubuntu1~ubuntu18.04.1
ADD https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-amd64.tar.gz /tmp/
RUN tar xzf /tmp/s6-overlay-amd64.tar.gz -C /
COPY /rootfs /
COPY --from=backendbuild /go/src/github.com/analogj/scrutiny/scrutiny /scrutiny/bin/ COPY --from=backendbuild /go/src/github.com/analogj/scrutiny/scrutiny /scrutiny/bin/
COPY --from=backendbuild /go/src/github.com/analogj/scrutiny/scrutiny-collector-selftest /scrutiny/bin/
COPY --from=backendbuild /go/src/github.com/analogj/scrutiny/scrutiny-collector-metrics /scrutiny/bin/
COPY --from=frontendbuild /scrutiny/dist /scrutiny/web COPY --from=frontendbuild /scrutiny/dist /scrutiny/web
RUN chmod +x /scrutiny/bin/scrutiny && \ RUN chmod +x /scrutiny/bin/scrutiny && \
chmod +x /scrutiny/bin/scrutiny-collector-selftest && \
chmod +x /scrutiny/bin/scrutiny-collector-metrics && \
mkdir -p /scrutiny/web && \ mkdir -p /scrutiny/web && \
mkdir -p /scrutiny/config && \ mkdir -p /scrutiny/config
mkdir -p /scrutiny/jobber CMD ["/scrutiny", "start"]
CMD ["/init"]