Skip to content

Commit b1b34aa

Browse files
Fixed containers stack discrepancy.
1 parent cce66b9 commit b1b34aa

2 files changed

Lines changed: 13 additions & 10 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ jobs:
5959
fi
6060
else
6161
echo "Database container not found. Creating it..."
62-
docker compose up -d db
62+
# Added -p flag to associate with the correct stack
63+
docker compose -p codebuilder-frontend up -d db
6364
fi
6465
6566
# Step 3: Wait for the database to be healthy.
@@ -76,15 +77,17 @@ jobs:
7677
7778
# Step 4: Build the new webapp image.
7879
echo "Building the latest webapp image..."
79-
docker compose build webapp
80+
# Added -p flag to ensure build context is correct
81+
docker compose -p codebuilder-frontend build webapp
8082
8183
# Step 5: Forcefully remove the old webapp container to prevent conflicts.
8284
echo "Forcefully removing old webapp container if it exists..."
8385
docker rm -f codebuilder-webapp || true
8486
8587
# Step 6: Deploy the new webapp container.
8688
echo "Deploying the new webapp container..."
87-
docker compose up -d --no-deps webapp
89+
# Added -p flag to associate with the correct stack
90+
docker compose -p codebuilder-frontend up -d --no-deps webapp
8891
8992
- name: '🗑 Prune Old Docker Images'
9093
if: always()

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
"start": "next start",
1010
"lint": "next lint",
1111
"// -- LOCAL DATABASE & PRISMA --": "",
12-
"dev:db:start": "docker compose -f docker-compose.local.yml up -d",
13-
"dev:db:stop": "docker compose -f docker-compose.local.yml down",
12+
"dev:db:start": "docker compose -p codebuilder-frontend -f docker-compose.local.yml up -d",
13+
"dev:db:stop": "docker compose -p codebuilder-frontend -f docker-compose.local.yml down",
1414
"dev:db:prepare": "docker exec codebuilder-postgres-db psql -U codebuilder -d postgres -c \"CREATE DATABASE codebuilder_main_shadow;\" || true",
1515
"prisma:migrate": "DATABASE_URL=\"postgresql://codebuilder:joker123@localhost:5434/codebuilder_main\" SHADOW_DATABASE_URL=\"postgresql://codebuilder:joker123@localhost:5434/codebuilder_main_shadow\" npx prisma migrate dev",
1616
"prisma:generate": "DATABASE_URL=\"postgresql://codebuilder:joker123@localhost:5434/codebuilder_main\" SHADOW_DATABASE_URL=\"postgresql://codebuilder:joker123@localhost:5434/codebuilder_main_shadow\" npx prisma generate",
1717
"prisma:studio": "DATABASE_URL=\"postgresql://codebuilder:joker123@localhost:5434/codebuilder_main\" SHADOW_DATABASE_URL=\"postgresql://codebuilder:joker123@localhost:5434/codebuilder_main_shadow\" npx prisma studio",
1818
"// -- MANUAL DOCKER MGMT (for the main docker-compose.yml on your server) --": "",
19-
"prod:up": "docker compose up -d",
20-
"prod:down": "docker compose down",
21-
"prod:logs": "docker compose logs -f webapp",
22-
"prod:deploy:webapp": "docker compose up -d --build --no-deps webapp",
19+
"prod:up": "docker compose -p codebuilder-frontend up -d",
20+
"prod:down": "docker compose -p codebuilder-frontend down",
21+
"prod:logs": "docker compose -p codebuilder-frontend logs -f webapp",
22+
"prod:deploy:webapp": "docker compose -p codebuilder-frontend up -d --build --no-deps webapp",
2323
"// DANGEROUS: Wipes the ENTIRE database. Use with extreme caution.": "",
24-
"prod:reset": "docker compose down --volumes && docker compose up --build -d"
24+
"prod:reset": "docker compose -p codebuilder-frontend down --volumes && docker compose -p codebuilder-frontend up --build -d"
2525
},
2626
"dependencies": {
2727
"@fortawesome/fontawesome-svg-core": "^6.7.2",

0 commit comments

Comments
 (0)