Skip to content

Commit

Permalink
updating node modules to deal with Conflicting peer dependency • upda…
Browse files Browse the repository at this point in the history
…tes to docker files
  • Loading branch information
AnselmMarie committed Oct 13, 2024
1 parent c881e91 commit f84c451
Show file tree
Hide file tree
Showing 7 changed files with 32,656 additions and 18,708 deletions.
2 changes: 1 addition & 1 deletion apps/api/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ WORKDIR /app

# Copy package files and install dependencies
COPY package*.json ./
RUN npm install --legacy-peer-deps
RUN npm install

# Copy the project files
COPY . .
Expand Down
6 changes: 3 additions & 3 deletions apps/api/Dockerfile.prod
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ ENV HUSKY_SKIP_INSTALL=1

# Copy package files and install dependencies
COPY package.json package-lock.json ./
RUN npm ci --omit=dev
RUN npm ci [email protected]
RUN npm install --omit=dev
RUN npm install [email protected]

# Copy the project files
COPY .env.production .env
Expand All @@ -26,7 +26,7 @@ COPY --from=builder /app/dist/apps/api ./dist
COPY package*.json ./

# Install a lightweight HTTP server to serve the static files
RUN npm ci
RUN npm install
#--legacy-peer-deps

# Expose the port the app runs on
Expand Down
2 changes: 1 addition & 1 deletion apps/web-app/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ WORKDIR /app

# Copy package files and install dependencies
COPY package*.json ./
RUN npm install --legacy-peer-deps
RUN npm install

# Copy the project files
COPY . .
Expand Down
4 changes: 2 additions & 2 deletions apps/web-app/Dockerfile.prod
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ ENV HUSKY_SKIP_INSTALL=1

# Copy package files and install dependencies
COPY package.json package-lock.json ./
RUN npm ci --omit=dev
RUN npm ci [email protected]
RUN npm install --omit=dev
RUN npm install [email protected]

# Copy the project files
COPY .env.production .env
Expand Down
8 changes: 0 additions & 8 deletions apps/web-app/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
/// <reference types='vitest' />
import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
import react from '@vitejs/plugin-react';
import dotenv from 'dotenv';
import { defineConfig } from 'vite';

dotenv.config();

console.log('process.env', process.env);

export default defineConfig({
root: __dirname,
cacheDir: '../../node_modules/.vite/apps/web-app',
// define: {
// 'process.env': process.env,
// },

server: {
port: 4200,
Expand Down
Loading

0 comments on commit f84c451

Please sign in to comment.