trying to fix docker image builds (take 1h+ right now).

trying to fix docker image builds (take 1h+ right now). trying to fix docker image builds (take 1h+ right now). trying to fix docker image builds (take 1h+ right now). trying to fix docker image builds (take 1h+ right now). trying to fix docker image builds (take 1h+ right now). trying to fix docker image builds (take 1h+ right now). trying to fix docker image builds (take 1h+ right now). trying to fix docker image builds (take 1h+ right now).
2022-06-04 10:29:03 -07:00
parent df23ecdf33
commit 6005b8609a
5 changed files with 38 additions and 37 deletions
@@ -10,21 +10,6 @@ RUN go mod vendor && \
    go build -ldflags '-w -extldflags "-static"' -o scrutiny-collector-selftest collector/cmd/collector-selftest/collector-selftest.go && \
    go build -ldflags '-w -extldflags "-static"' -o scrutiny-collector-metrics collector/cmd/collector-metrics/collector-metrics.go

-########
-FROM node:lts-slim as frontendbuild
-
-#reduce logging, disable angular-cli analytics for ci environment
-ENV NPM_CONFIG_LOGLEVEL=warn NG_CLI_ANALYTICS=false
-
-WORKDIR /opt/scrutiny/src
-COPY webapp/frontend /opt/scrutiny/src
-
-RUN npm install -g @angular/cli@9.1.4 && \
-    mkdir -p /scrutiny/dist && \
-    npm install && \
-    npm run build:prod -- --output-path=/opt/scrutiny/dist
-
-
 ########
 FROM ubuntu:latest as runtime
 ARG TARGETARCH
@@ -52,7 +37,7 @@ COPY /rootfs/etc/cron.d/scrutiny /etc/cron.d/scrutiny
 COPY --from=backendbuild /go/src/github.com/analogj/scrutiny/scrutiny /opt/scrutiny/bin/
 COPY --from=backendbuild /go/src/github.com/analogj/scrutiny/scrutiny-collector-selftest /opt/scrutiny/bin/
 COPY --from=backendbuild /go/src/github.com/analogj/scrutiny/scrutiny-collector-metrics /opt/scrutiny/bin/
-COPY --from=frontendbuild /opt/scrutiny/dist /opt/scrutiny/web
+COPY dist /opt/scrutiny/web
 RUN chmod +x /opt/scrutiny/bin/scrutiny && \
    chmod +x /opt/scrutiny/bin/scrutiny-collector-selftest && \
    chmod +x /opt/scrutiny/bin/scrutiny-collector-metrics && \
@@ -8,21 +8,6 @@ COPY . /go/src/github.com/analogj/scrutiny
 RUN go mod vendor && \
    go build -ldflags '-w -extldflags "-static"' -o scrutiny webapp/backend/cmd/scrutiny/scrutiny.go

-########
-FROM node:lts-slim as frontendbuild
-
-#reduce logging, disable angular-cli analytics for ci environment
-ENV NPM_CONFIG_LOGLEVEL=warn NG_CLI_ANALYTICS=false
-
-WORKDIR /opt/scrutiny/src
-COPY webapp/frontend /opt/scrutiny/src
-
-RUN npm install -g @angular/cli@9.1.4 && \
-    mkdir -p /opt/scrutiny/dist && \
-    npm install && \
-    npm run build:prod -- --output-path=/opt/scrutiny/dist
-
-
 ########
 FROM ubuntu:latest as runtime
 EXPOSE 8080
@@ -32,7 +17,7 @@ ENV PATH="/opt/scrutiny/bin:${PATH}"
 RUN apt-get update && apt-get install -y ca-certificates curl tzdata && update-ca-certificates

 COPY --from=backendbuild /go/src/github.com/analogj/scrutiny/scrutiny /opt/scrutiny/bin/
-COPY --from=frontendbuild /opt/scrutiny/dist /opt/scrutiny/web
+COPY dist /opt/scrutiny/web
 RUN chmod +x /opt/scrutiny/bin/scrutiny && \
    mkdir -p /opt/scrutiny/web && \
    mkdir -p /opt/scrutiny/config && \