File tree Expand file tree Collapse file tree 4 files changed +28
-0
lines changed Expand file tree Collapse file tree 4 files changed +28
-0
lines changed Original file line number Diff line number Diff line change 46
46
47
47
# Step 8: Push Frontend Docker image to Docker Hub
48
48
- name : Push Frontend Docker image
49
+ <<<<<<< HEAD
49
50
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)
Original file line number Diff line number Diff line change @@ -22,7 +22,11 @@ The API code exists in the `api` directory. You can run the API server locally:
22
22
- Create a virtualenv by typing in the following command: ` python3 -m venv .venv `
23
23
- Run command ` source .venv/bin `
24
24
- Run command ` source .venv/bin/activate `
25
+ <<<<<<< HEAD
25
26
- 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)
26
30
- Create a ` .env ` file, and add you AWS Access and Secret key, check ` .env.example `
27
31
- and Save the Access & secret key, cat the ` .env ` to verify.
28
32
- Also, change the BUCKET_NAME to your S3 bucket name in ` main.py `
Original file line number Diff line number Diff line change @@ -11,19 +11,38 @@ COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
11
11
COPY install-dependencies.sh ./
12
12
13
13
# Install dependencies using the script
14
+ <<<<<<< HEAD
14
15
RUN ./install-dependencies.sh
16
+ =======
17
+ RUN chmod +x ./install-dependencies.sh && ./install-dependencies.sh
18
+ >>>>>>> 9db5a81 (Moved Terraform files into the infrastructure folder)
15
19
16
20
# Copy the rest of the application code
17
21
COPY . .
18
22
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)
19
35
# Expose the application port
20
36
EXPOSE 3000
21
37
22
38
# Start the application
23
39
CMD ["npm" , "start" ]
40
+ <<<<<<< HEAD
24
41
25
42
# Build the Next.js app
26
43
RUN npm run build
27
44
28
45
# Expose the build folder
29
46
COPY .next ./.next
47
+ =======
48
+ >>>>>>> 9db5a81 (Moved Terraform files into the infrastructure folder)
Original file line number Diff line number Diff line change
1
+ Subproject commit 63de5eeb27bd562bf2b9c8d18f0d0f065f5f9ffb
You can’t perform that action at this time.
0 commit comments