From bd999e4003d92ba4e8923a4078336d545f6fce84 Mon Sep 17 00:00:00 2001 From: funtigr Date: Mon, 6 Jan 2025 12:54:22 -0800 Subject: [PATCH] fix(4602): add --no-frozen-lockfile flag to pnpm install calls --- .github/actions/setup-npm/action.yml | 4 ++-- Makefile | 2 +- app/Dockerfile | 2 +- app/Dockerfile.email | 2 +- data-migrations/Dockerfile | 2 +- helm/_app/templates/job-pre-prisma.yaml | 1 + localdev/ches-mock/Dockerfile | 2 +- localdev/keycloak-provision/Dockerfile | 4 ++-- localdev/m365mock/Dockerfile | 2 +- localdev/nats-provision/Dockerfile | 4 ++-- 10 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/actions/setup-npm/action.yml b/.github/actions/setup-npm/action.yml index fb95f7e87..02c9d9c60 100755 --- a/.github/actions/setup-npm/action.yml +++ b/.github/actions/setup-npm/action.yml @@ -17,10 +17,10 @@ runs: ${{ runner.os }}-nextjs-${{ hashFiles('**/pnpm-lock.yaml') }}- - name: Install Root NPM packages - run: pnpm install + run: pnpm install --no-frozen-lockfile shell: bash - name: Install App NPM packages - run: pnpm install + run: pnpm install --no-frozen-lockfile shell: bash working-directory: app diff --git a/Makefile b/Makefile index 276149f42..82394fcbf 100755 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ dev: .PHONY: install install: - pnpm install + pnpm install --no-frozen-lockfile npm install --prefix app npm install --prefix data-migrations diff --git a/app/Dockerfile b/app/Dockerfile index 303e90222..865ef5bc3 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -15,7 +15,7 @@ ENV SECURE_HEADERS=true \ DEPLOYMENT_TAG=${deployment_tag} RUN npm install -g turbo pnpm -RUN pnpm install --frozen-lockfile +RUN pnpm install --no-frozen-lockfile RUN npx ts-node scripts/render-react-email-tailwind-style.ts RUN pnpm build diff --git a/app/Dockerfile.email b/app/Dockerfile.email index a00b7e4fd..687813ece 100644 --- a/app/Dockerfile.email +++ b/app/Dockerfile.email @@ -12,7 +12,7 @@ COPY .prettierrc . ENV BASE_URL=https://dev-pltsvc.apps.silver.devops.gov.bc.ca RUN npm install -g turbo pnpm -RUN pnpm install --frozen-lockfile +RUN pnpm install --no-frozen-lockfile RUN pnpm email-build RUN mkdir -p .react-email/public diff --git a/data-migrations/Dockerfile b/data-migrations/Dockerfile index 90f20787a..f5cdda390 100644 --- a/data-migrations/Dockerfile +++ b/data-migrations/Dockerfile @@ -6,7 +6,7 @@ COPY ["package.json", "pnpm-lock.yaml", "migrate-mongo-config.js", "./"] COPY migrations migrations RUN npm install -g turbo pnpm -RUN pnpm install --ignore-scripts +RUN pnpm install --no-frozen-lockfile --ignore-scripts USER node diff --git a/helm/_app/templates/job-pre-prisma.yaml b/helm/_app/templates/job-pre-prisma.yaml index 5ca07c1e3..8602aa15a 100644 --- a/helm/_app/templates/job-pre-prisma.yaml +++ b/helm/_app/templates/job-pre-prisma.yaml @@ -44,4 +44,5 @@ spec: requests: cpu: 0.2 memory: 200M + - command: ["/bin/sh", "-c", "sleep 1700"] {{- end }} diff --git a/localdev/ches-mock/Dockerfile b/localdev/ches-mock/Dockerfile index f74bee087..660bc2bb4 100644 --- a/localdev/ches-mock/Dockerfile +++ b/localdev/ches-mock/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /opt COPY ches-mock ./context RUN npm install -g turbo pnpm -RUN cd context && pnpm install --ignore-scripts && pnpm build +RUN cd context && pnpm install --no-frozen-lockfile --ignore-scripts && pnpm build FROM node:22.10.0-alpine3.19 WORKDIR /opt diff --git a/localdev/keycloak-provision/Dockerfile b/localdev/keycloak-provision/Dockerfile index 4bc4676c3..17bc66db5 100644 --- a/localdev/keycloak-provision/Dockerfile +++ b/localdev/keycloak-provision/Dockerfile @@ -6,8 +6,8 @@ COPY keycloak-provision ./context COPY _packages ./_packages RUN npm install -g turbo pnpm -RUN cd context && pnpm install --ignore-scripts -RUN cd _packages/keycloak-admin && pnpm install --ignore-scripts && pnpm build +RUN cd context && pnpm install --no-frozen-lockfile --ignore-scripts +RUN cd _packages/keycloak-admin && pnpm install --no-frozen-lockfile --ignore-scripts && pnpm build RUN cd context && pnpm build FROM node:22.10.0-alpine3.19 diff --git a/localdev/m365mock/Dockerfile b/localdev/m365mock/Dockerfile index 55cd2d25b..eaf4625cd 100644 --- a/localdev/m365mock/Dockerfile +++ b/localdev/m365mock/Dockerfile @@ -5,7 +5,7 @@ COPY ["mock-users.json", "types.ts", "./"] COPY m365mock ./context RUN npm install -g turbo pnpm -RUN cd context && pnpm install --ignore-scripts && pnpm build +RUN cd context && pnpm install --no-frozen-lockfile --ignore-scripts && pnpm build FROM node:22.10.0-alpine3.19 WORKDIR /opt diff --git a/localdev/nats-provision/Dockerfile b/localdev/nats-provision/Dockerfile index c1633abb5..a87a523d7 100644 --- a/localdev/nats-provision/Dockerfile +++ b/localdev/nats-provision/Dockerfile @@ -6,8 +6,8 @@ COPY nats-provision ./context COPY _packages ./_packages RUN npm install -g turbo pnpm -RUN cd context && pnpm install --ignore-scripts -RUN cd _packages/keycloak-admin && pnpm install --ignore-scripts && pnpm build +RUN cd context && pnpm install --no-frozen-lockfile --ignore-scripts +RUN cd _packages/keycloak-admin && pnpm install --no-frozen-lockfile --ignore-scripts && pnpm build RUN cd context && pnpm build FROM node:22.10.0-alpine3.19