Unresolved Git merge conflicts

[Klemart3D]

Hi,

You're big update2 commit introduced a lot of unresolved Git merge conflicts that failed to build the Docker image:

± docker build -t log-voyager .
[+] Building 0.0s (1/1) FINISHED                                                             docker:desktop-linux
 => [internal] load build definition from Dockerfile                                                         0.0s
 => => transferring dockerfile: 1.26kB                                                                       0.0s
Dockerfile:1
--------------------
   1 | >>> <<<<<<< HEAD
   2 |     # Etap 1: Budowanie aplikacji (Node.js)
   3 |     FROM node:18-alpine as builder
--------------------
ERROR: failed to build: failed to solve: dockerfile parse error on line 1: unknown instruction: <<<<<<<

[yatoub]

Hi,

In addition, even when the merge conflict is resolved, a build error still occurs in the builder stage:

Step 4/11 : RUN npm install
 ---> Running in 82585d9bb428
npm WARN EBADENGINE Unsupported engine {
npm WARN EBADENGINE   package: '@isaacs/balanced-match@4.0.1',
npm WARN EBADENGINE   required: { node: '20 || >=22' },
npm WARN EBADENGINE   current: { node: 'v18.20.8', npm: '10.8.2' }
}

I replaced the Dockerfile with the following one:

# Step 1: Build the application (Node.js)
FROM node:alpine AS builder
WORKDIR /app
COPY package.json package-lock.json ./
RUN npm install
COPY . .
RUN npm run build

# Step 2: Serve the application (Nginx)
FROM nginx:alpine
# Copy the built files to Nginx
COPY --from=builder /app/dist /usr/share/nginx/html
# Add configuration for React Router (optional but recommended)
RUN echo 'server { listen 80; root /usr/share/nginx/html; index index.html; location / { try_files $uri $uri/ /index.html; } }' > /etc/nginx/conf.d/default.conf
EXPOSE 80
CMD ["nginx", "-g", "daemon off;"]

With this Dockerfile, I am now able to build the container successfully.

[citiz3nn]

+1