diff --git a/Dockerfile b/Dockerfile index a6356d7..b14c5e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,7 @@ RUN chown -R node:node /app USER node COPY --chown=node:node . . +RUN npm config set package-lock false RUN yarn install --production=true ENTRYPOINT ["sh", "entrypoint.sh"] diff --git a/src/service/project-preparation/project-preparation-service.ts b/src/service/project-preparation/project-preparation-service.ts index d933eea..1f3a4f6 100644 --- a/src/service/project-preparation/project-preparation-service.ts +++ b/src/service/project-preparation/project-preparation-service.ts @@ -2,27 +2,10 @@ import {execSync} from "child_process"; import SubmissionProject from "../../entities/submission-project/submission-project"; import ServerErrorException from "../../exception/server-error-exception"; import raiseDomainEvent from "../../common/domain-event"; -import * as fs from "fs"; -import {join} from "path"; class ProjectPreparationService { install(submissionProject: SubmissionProject) { try { - const isPackageLockExist = fs.existsSync(join(submissionProject.packageJsonPath, 'package-lock.json')) - const isYarnLockExist = fs.existsSync(join(submissionProject.packageJsonPath, 'yarn.lock')) - - if (isPackageLockExist) { - execSync('npm ci', {cwd: submissionProject.packageJsonPath, stdio: 'pipe', encoding:'utf-8'}) - raiseDomainEvent('dependencies installed') - return - } - - if (isYarnLockExist) { - execSync('yarn install --frozen-lockfile', {cwd: submissionProject.packageJsonPath, stdio: 'pipe', encoding:'utf-8'}) - raiseDomainEvent('dependencies installed') - return - } - execSync('npm install', {cwd: submissionProject.packageJsonPath, stdio: 'pipe', encoding:'utf-8'}) raiseDomainEvent('dependencies installed') } catch (e) {