diff --git a/docker-compose.yml b/docker-compose.yml
index 93ed6029..58f83408 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -155,7 +155,9 @@ services:
- default
klz-imgproxy:
- image: registry.infra.mintel.me/mintel/image-processor:latest
+ build:
+ context: ../at-mintel
+ dockerfile: apps/image-service/Dockerfile
restart: unless-stopped
networks:
- default
diff --git a/middleware.ts b/middleware.ts
index 5b7384d9..9af37efa 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -16,7 +16,7 @@ async function isImgproxyDown() {
const now = Date.now();
if (now - imgproxyStatus.lastCheck > 60000) {
try {
- const imgproxyUrl = process.env.IMGPROXY_URL || 'https://img.infra.mintel.me';
+ const imgproxyUrl = process.env.IMGPROXY_URL || 'http://klz-imgproxy:8080';
const checkUrl = imgproxyUrl.startsWith('http') ? imgproxyUrl : `https://${imgproxyUrl}`;
const res = await fetch(checkUrl, { signal: AbortSignal.timeout(2000) });
imgproxyStatus.isDown = res.status >= 500;
diff --git a/next-env.d.ts b/next-env.d.ts
index 9edff1c7..c4b7818f 100644
--- a/next-env.d.ts
+++ b/next-env.d.ts
@@ -1,6 +1,6 @@
///
///
-import "./.next/types/routes.d.ts";
+import "./.next/dev/types/routes.d.ts";
// NOTE: This file should not be edited
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/next.config.mjs b/next.config.mjs
index 7c274fc8..80daa7c4 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -24,7 +24,7 @@ const nextConfig = {
async headers() {
const umamiDomain = new URL(process.env.UMAMI_API_ENDPOINT || 'https://analytics.infra.mintel.me').origin;
const directusDomain = new URL(process.env.DIRECTUS_URL || 'https://cms.klz-cables.com').origin;
- const imgproxyDomain = new URL(process.env.IMGPROXY_URL || 'https://img.infra.mintel.me').origin;
+ const imgproxyDomain = new URL(process.env.IMGPROXY_URL || 'http://klz-imgproxy:8080').origin;
const glitchtipDomain = new URL(process.env.SENTRY_DSN ? new URL(process.env.SENTRY_DSN).origin : 'https://errors.infra.mintel.me').origin;
const cspHeader = `
@@ -395,7 +395,7 @@ const nextConfig = {
const directusUrl = process.env.INTERNAL_DIRECTUS_URL || process.env.DIRECTUS_URL || 'https://cms.klz-cables.com';
- let imgproxyUrl = process.env.IMGPROXY_URL || 'https://img.infra.mintel.me';
+ let imgproxyUrl = process.env.IMGPROXY_URL || 'http://klz-imgproxy:8080';
if (!imgproxyUrl.startsWith('http')) {
imgproxyUrl = `https://${imgproxyUrl}`;
}
diff --git a/scripts/sync-directus.sh b/scripts/sync-directus.sh
index 68468436..946455fd 100755
--- a/scripts/sync-directus.sh
+++ b/scripts/sync-directus.sh
@@ -5,7 +5,8 @@ REMOTE_HOST="root@alpha.mintel.me"
REMOTE_DIR="/home/deploy/sites/klz-cables.com"
# DB Details (matching docker-compose defaults)
-DB_USER="klz_db_user"
+LOCAL_DB_USER="klz_db_user"
+REMOTE_DB_USER="directus"
DB_NAME="directus"
ACTION=$1
@@ -26,19 +27,9 @@ fi
# Map Environment to Project Name
case $ENV in
- testing)
- PROJECT_NAME="klz-cables-testing"
- ENV_FILE=".env.testing"
- ;;
- staging)
- PROJECT_NAME="klz-cables-staging"
- ENV_FILE=".env.staging"
- ;;
- production)
- PROJECT_NAME="klz-cables-prod"
- # Fallback to older project name if prod-specific one isn't found later in the script
- OLD_PROJECT_NAME="klz-cablescom"
- ENV_FILE=".env.prod"
+ production|staging|testing)
+ PROJECT_NAME="klz-cablescom"
+ ENV_FILE=".env"
;;
*)
echo "โ Invalid environment: $ENV. Use testing, staging, or production."
@@ -82,10 +73,10 @@ if [ "$ACTION" == "push" ]; then
# Wipe remote DB clean before restore to avoid constraint errors
echo "๐งน Wiping remote database schema..."
- ssh "$REMOTE_HOST" "docker exec $REMOTE_DB_CONTAINER psql -U $DB_USER $DB_NAME -c 'DROP SCHEMA public CASCADE; CREATE SCHEMA public;'"
+ ssh "$REMOTE_HOST" "docker exec $REMOTE_DB_CONTAINER psql -U $REMOTE_DB_USER $DB_NAME -c 'DROP SCHEMA public CASCADE; CREATE SCHEMA public;'"
echo "โก Restoring database..."
- ssh "$REMOTE_HOST" "docker exec -i $REMOTE_DB_CONTAINER psql -U $DB_USER $DB_NAME < $REMOTE_DIR/dump.sql"
+ ssh "$REMOTE_HOST" "docker exec -i $REMOTE_DB_CONTAINER psql -U $REMOTE_DB_USER $DB_NAME < $REMOTE_DIR/dump.sql"
# 4. Sync Uploads
echo "๐ Syncing uploads (Local -> $ENV)..."
@@ -106,19 +97,14 @@ if [ "$ACTION" == "push" ]; then
elif [ "$ACTION" == "pull" ]; then
echo "๐ฅ Pulling $ENV Data to Local..."
- # 1. DB Dump on Remote
- echo "๐ฆ Dumping remote database ($ENV)..."
- REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $PROJECT_NAME ps -q directus-db")
- if [ -z "$REMOTE_DB_CONTAINER" ] && [ -n "$OLD_PROJECT_NAME" ]; then
- echo "โ ๏ธ $PROJECT_NAME not found, trying fallback $OLD_PROJECT_NAME..."
- REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $OLD_PROJECT_NAME ps -q directus-db")
- fi
+ # The remote service name is 'klz-db' according to docker compose config
+ REMOTE_DB_CONTAINER=$(ssh "$REMOTE_HOST" "cd $REMOTE_DIR && docker compose -p $PROJECT_NAME ps -q klz-db")
if [ -z "$REMOTE_DB_CONTAINER" ]; then
echo "โ Remote $ENV-db container not found!"
exit 1
fi
- ssh "$REMOTE_HOST" "docker exec $REMOTE_DB_CONTAINER pg_dump -U $DB_USER --clean --if-exists --no-owner --no-privileges $DB_NAME > $REMOTE_DIR/dump.sql"
+ ssh "$REMOTE_HOST" "docker exec $REMOTE_DB_CONTAINER pg_dump -U $REMOTE_DB_USER --clean --if-exists --no-owner --no-privileges $DB_NAME > $REMOTE_DIR/dump.sql"
# 2. Download Dump
echo "๐ฅ Downloading dump..."
@@ -126,10 +112,10 @@ elif [ "$ACTION" == "pull" ]; then
# Wipe local DB clean before restore to avoid constraint errors
echo "๐งน Wiping local database schema..."
- docker exec "$LOCAL_DB_CONTAINER" psql -U "$DB_USER" "$DB_NAME" -c 'DROP SCHEMA public CASCADE; CREATE SCHEMA public;'
+ docker exec "$LOCAL_DB_CONTAINER" psql -U "$LOCAL_DB_USER" "$DB_NAME" -c 'DROP SCHEMA public CASCADE; CREATE SCHEMA public;'
echo "โก Restoring database locally..."
- docker exec -i "$LOCAL_DB_CONTAINER" psql -U "$DB_USER" "$DB_NAME" < dump.sql
+ docker exec -i "$LOCAL_DB_CONTAINER" psql -U "$LOCAL_DB_USER" "$DB_NAME" < dump.sql
# 4. Sync Uploads
echo "๐ Syncing uploads ($ENV -> Local)..."