From b137692932aa4eb0d6240e9e935a7363346baf66 Mon Sep 17 00:00:00 2001 From: Peter Harrison <16875803+palisadoes@users.noreply.github.com> Date: Wed, 5 Feb 2025 13:37:12 -0800 Subject: [PATCH] Revert "pnpm roll back (#3148)" (#3150) This reverts commit 6755bc565c4707bcaebddc010f2953ef4d4a72ad. --- .devcontainer/devcontainer.json | 2 +- docker/api.Containerfile | 14 +++++++------- package.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 927f440b0a1..435747673c9 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -70,7 +70,7 @@ "initializeCommand": "/bin/sh -c '[ ! -f .env ] && cp ./envFiles/.env.devcontainer ./.env || true'", "name": "talawa_api", "overrideCommand": true, - "postCreateCommand": "sudo chown talawa:talawa ./.pnpm-store ./node_modules && fnm install && fnm use && corepack enable && corepack prepare pnpm@10.0.0 --activate && pnpm install --prod=false && pnpm start_development_server", + "postCreateCommand": "export COREPACK_INTEGRITY_KEYS=0 && sudo chown talawa:talawa ./.pnpm-store ./node_modules && fnm install && fnm use && corepack enable npm && corepack enable && corepack install && pnpm install --prod=false && pnpm start_development_server", "postStartCommand": "pnpm install --prod=false", "remoteUser": "talawa", "service": "api", diff --git a/docker/api.Containerfile b/docker/api.Containerfile index 4c6c18db59c..eb621716828 100644 --- a/docker/api.Containerfile +++ b/docker/api.Containerfile @@ -53,29 +53,29 @@ RUN userdel -r node \ && groupadd -g ${API_GID} talawa \ # Adds the "talawa" user with id equal to the value of argument "${API_UID}", assigns it to "talawa" group, creates the home directory for "talawa" user, sets bash as the "talawa" user's login shell. && useradd -g talawa -l -m -s "$(which bash)" -u ${API_UID} talawa \ -&& corepack enable && corepack prepare pnpm@10.0.0 --activate +&& corepack enable USER talawa WORKDIR /home/talawa/api FROM base AS non_production COPY --chown=talawa:talawa ./pnpm-lock.yaml ./pnpm-lock.yaml -RUN corepack prepare pnpm@10.0.0 --activate && pnpm fetch --frozen-lockfile +RUN pnpm fetch --frozen-lockfile COPY --chown=talawa:talawa ./ ./ -RUN corepack prepare pnpm@10.0.0 --activate && pnpm install --frozen-lockfile --offline +RUN pnpm install --frozen-lockfile --offline # This build stage is used to build the codebase used in production environment of talawa api. FROM base AS production_code COPY --chown=talawa:talawa ./pnpm-lock.yaml ./pnpm-lock.yaml -RUN corepack prepare pnpm@10.0.0 --activate && pnpm fetch --frozen-lockfile +RUN pnpm fetch --frozen-lockfile COPY --chown=talawa:talawa ./ ./ -RUN corepack prepare pnpm@10.0.0 --activate && pnpm install --frozen-lockfile --offline && pnpm build_production +RUN pnpm install --frozen-lockfile --offline && pnpm build_production # This build stage is used to download and install the dependencies used in production environment of talawa api. FROM base AS production_dependencies COPY --chown=talawa:talawa ./pnpm-lock.yaml ./pnpm-lock.yaml -RUN corepack prepare pnpm@10.0.0 --activate && pnpm fetch --frozen-lockfile --prod +RUN pnpm fetch --frozen-lockfile --prod COPY --chown=talawa:talawa ./package.json ./package.json -RUN corepack prepare pnpm@10.0.0 --activate && pnpm install --frozen-lockfile --offline --prod +RUN pnpm install --frozen-lockfile --offline --prod # This build stage is used to create the container image for production environment of talawa api. FROM base AS production diff --git a/package.json b/package.json index 0ffd634fa6a..6a6235dfa13 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "license": "GNU General Public License v3.0", "main": "./dist/index.js", "name": "talawa-api", - "packageManager": "pnpm@10.0.0", + "packageManager": "pnpm@9.15.4", "repository": { "type": "git", "url": "https://github.com/PalisadoesFoundation/talawa-api"