diff --git a/Dockerfile b/Dockerfile index 3d307de..f838eb8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,10 +10,10 @@ WORKDIR /app # Копируем файлы для установки зависимостей COPY package.json package-lock.json* pnpm-lock.yaml* ./ RUN \ - if [ -f pnpm-lock.yaml ]; then \ - corepack enable pnpm && pnpm install --frozen-lockfile; \ - elif [ -f package-lock.json ]; then \ + if [ -f package-lock.json ]; then \ npm ci; \ + elif [ -f pnpm-lock.yaml ]; then \ + corepack enable pnpm && corepack prepare pnpm@latest --activate && pnpm install --frozen-lockfile; \ else \ echo "Lockfile not found." && exit 1; \ fi @@ -28,8 +28,10 @@ COPY . . ENV NEXT_TELEMETRY_DISABLED=1 RUN \ - if [ -f pnpm-lock.yaml ]; then \ - corepack enable pnpm && pnpm run build; \ + if [ -f package-lock.json ]; then \ + npm run build; \ + elif [ -f pnpm-lock.yaml ]; then \ + corepack enable pnpm && corepack prepare pnpm@latest --activate && pnpm run build; \ else \ npm run build; \ fi diff --git a/docker-compose.yml b/docker-compose.yml index 800c97a..2e9c99c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: app: build: