Skip to content

Commit b828284

Browse files
committed
Recommit the project with infrastructure folder and Terraform configuration
1 parent d171606 commit b828284

File tree

2 files changed

+0
-20
lines changed

2 files changed

+0
-20
lines changed

.github/workflows/build-docker.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,4 @@ jobs:
4646

4747
# Step 8: Push Frontend Docker image to Docker Hub
4848
- name: Push Frontend Docker image
49-
<<<<<<< HEAD
5049
run: docker push echelonkay/devops-qr-code-frontend:latest
51-
=======
52-
run: docker push echelonkay/devops-qr-code-frontend:latest
53-
>>>>>>> 9db5a81 (Moved Terraform files into the infrastructure folder)

front-end-nextjs/Dockerfile

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,11 @@ COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
1111
COPY install-dependencies.sh ./
1212

1313
# Install dependencies using the script
14-
<<<<<<< HEAD
15-
RUN ./install-dependencies.sh
16-
=======
1714
RUN chmod +x ./install-dependencies.sh && ./install-dependencies.sh
18-
>>>>>>> 9db5a81 (Moved Terraform files into the infrastructure folder)
1915

2016
# Copy the rest of the application code
2117
COPY . .
2218

23-
<<<<<<< HEAD
24-
=======
2519
# Run the Next.js build step
2620
RUN npm run build
2721

@@ -31,18 +25,8 @@ RUN mkdir -p .next
3125
# Copy the .next folder (to avoid context issues)
3226
COPY .next ./.next
3327

34-
>>>>>>> 9db5a81 (Moved Terraform files into the infrastructure folder)
3528
# Expose the application port
3629
EXPOSE 3000
3730

3831
# Start the application
3932
CMD ["npm", "start"]
40-
<<<<<<< HEAD
41-
42-
# Build the Next.js app
43-
RUN npm run build
44-
45-
# Expose the build folder
46-
COPY .next ./.next
47-
=======
48-
>>>>>>> 9db5a81 (Moved Terraform files into the infrastructure folder)

0 commit comments

Comments
 (0)