Skip to content

Commit d171606

Browse files
committed
Resolved merge conflicts
1 parent 63de5ee commit d171606

File tree

4 files changed

+28
-0
lines changed

4 files changed

+28
-0
lines changed

.github/workflows/build-docker.yaml

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

4747
# Step 8: Push Frontend Docker image to Docker Hub
4848
- name: Push Frontend Docker image
49+
<<<<<<< HEAD
4950
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)

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ The API code exists in the `api` directory. You can run the API server locally:
2222
- Create a virtualenv by typing in the following command: `python3 -m venv .venv`
2323
- Run command `source .venv/bin`
2424
- Run command `source .venv/bin/activate`
25+
<<<<<<< HEAD
2526
- Install the required packages: `pip install -r requirements.txt` 'or pip install fastapi uvicorn boto3 python-dotenv pytest qrcode'
27+
=======
28+
- Install the required packages: `pip install -r requirements.txt` or `pip install fastapi uvicorn boto3 python-dotenv pytest qrcode`
29+
>>>>>>> 9db5a81 (Moved Terraform files into the infrastructure folder)
2630
- Create a `.env` file, and add you AWS Access and Secret key, check `.env.example`
2731
- and Save the Access & secret key, cat the `.env` to verify.
2832
- Also, change the BUCKET_NAME to your S3 bucket name in `main.py`

front-end-nextjs/Dockerfile

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,38 @@ 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
1415
RUN ./install-dependencies.sh
16+
=======
17+
RUN chmod +x ./install-dependencies.sh && ./install-dependencies.sh
18+
>>>>>>> 9db5a81 (Moved Terraform files into the infrastructure folder)
1519

1620
# Copy the rest of the application code
1721
COPY . .
1822

23+
<<<<<<< HEAD
24+
=======
25+
# Run the Next.js build step
26+
RUN npm run build
27+
28+
# Expose the build folder
29+
RUN mkdir -p .next
30+
31+
# Copy the .next folder (to avoid context issues)
32+
COPY .next ./.next
33+
34+
>>>>>>> 9db5a81 (Moved Terraform files into the infrastructure folder)
1935
# Expose the application port
2036
EXPOSE 3000
2137

2238
# Start the application
2339
CMD ["npm", "start"]
40+
<<<<<<< HEAD
2441

2542
# Build the Next.js app
2643
RUN npm run build
2744

2845
# Expose the build folder
2946
COPY .next ./.next
47+
=======
48+
>>>>>>> 9db5a81 (Moved Terraform files into the infrastructure folder)

infrastructure

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 63de5eeb27bd562bf2b9c8d18f0d0f065f5f9ffb

0 commit comments

Comments
 (0)