Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Dockerfile.art
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ USER 0

# use dependencies provided by Cachito
ENV HUSKY=0
RUN test -d ${REMOTE_SOURCES_DIR}/cachito-gomod-with-deps || exit 1; \
cp -f $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app/registry-ca.pem . \
&& cp -f $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app/web/{.npmrc,package-lock.json} web/ \
&& source ${REMOTE_SOURCES_DIR}/cachito-gomod-with-deps/cachito.env \
&& make install-frontend-ci \
RUN test -d ${REMOTE_SOURCES_DIR}/cachito-gomod-with-deps || exit 1;
RUN cp -f $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app/registry-ca.pem .
RUN cp -f $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app/web/{.npmrc,package-lock.json} web/

RUN source ${REMOTE_SOURCES_DIR}/cachito-gomod-with-deps/cachito.env \
&& make install-frontend
RUN source ${REMOTE_SOURCES_DIR}/cachito-gomod-with-deps/cachito.env \
&& make build-frontend


Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.mcp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ USER 0
ENV HUSKY=0
COPY web/package*.json web/
COPY Makefile Makefile
RUN cd web && npm ci --legacy-peer-deps --omit=optional --ignore-scripts
RUN cd web && npm ci --legacy-peer-deps --ignore-scripts

COPY web/ web/
COPY config/ config/
Expand Down
11 changes: 8 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ PLUGIN_NAME ?=monitoring-plugin
IMAGE ?= quay.io/${ORG}/${PLUGIN_NAME}:${VERSION}
FEATURES ?=incidents,perses-dashboards,dev-config

export NODE_OPTIONS?=--max_old_space_size=4096

.PHONY: install-frontend
install-frontend:
cd web && npm install
cd web && npm install --verbose

.PHONY: install-frontend-ci
install-frontend-ci:
cd web && npm ci --omit=optional --ignore-scripts
cd web && npm ci --ignore-scripts

.PHONY: install-frontend-ci-clean
install-frontend-ci-clean: install-frontend-ci
Expand Down Expand Up @@ -109,8 +111,11 @@ start-devspace-backend:

.PHONY: podman-cross-build
podman-cross-build:
podman manifest create ${IMAGE}
podman manifest create -a ${IMAGE}
podman build --platform ${PLATFORMS} --manifest ${IMAGE} -f Dockerfile.mcp

.PHONY: podman-cross-build-push
podman-cross-build-push: podman-cross-build
podman manifest push ${IMAGE}

.PHONY: test-translations
Expand Down
6 changes: 0 additions & 6 deletions package-lock.json

This file was deleted.

Loading