Skip to content

Commit

Permalink
Sets pnpm as a default package manager
Browse files Browse the repository at this point in the history
  • Loading branch information
dcoric committed Nov 15, 2024
1 parent 79057cd commit b069de8
Show file tree
Hide file tree
Showing 7 changed files with 9,198 additions and 22,020 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,9 @@ test-k6-performance: ## run k6 performance tests.

.PHONY: web-build
web-build: ng ## build the web components.
npm install --prefix web
uhsApiURL=$(strip $(call uhs_api_url)) yunikornApiURL=$(strip $(call yunikorn_api_url)) npm run setenv --prefix web
npm run build --prefix web
pnpm --prefix ./web install
uhsApiURL=$(strip $(call uhs_api_url)) yunikornApiURL=$(strip $(call yunikorn_api_url)) pnpm --prefix ./web setenv
pnpm --prefix ./web build

.PHONY: build
build: bin/app ## build the unicorn-history-server binary for current OS and architecture.
Expand All @@ -326,7 +326,7 @@ clean: ## remove generated build artifacts.
rm -rf $(LOCALBIN_APP)

##@ Publish
NODE_VERSION ?= 20
NODE_VERSION ?= 18
ALPINE_VERSION ?= 3.20
DOCKER_OUTPUT ?= type=docker
DOCKER_TAGS ?= $(IMAGE_TAG)
Expand Down
7 changes: 4 additions & 3 deletions build/unicorn-history-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG NODE_VERSION=20
ARG NODE_VERSION=18
ARG ALPINE_VERSION=3.20

FROM node:${NODE_VERSION} AS builder
Expand All @@ -8,8 +8,9 @@ COPY web /build/src
WORKDIR /build/src

RUN npm install -g @angular/cli@18 && \
npm install && \
npm run build
npm install -g pnpm && \
pnpm install && \
pnpm run build

FROM alpine:${ALPINE_VERSION}

Expand Down
2 changes: 1 addition & 1 deletion web/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.17.0
v18
Loading

0 comments on commit b069de8

Please sign in to comment.