diff --git a/cloudbuild.yaml b/cloudbuild.yaml index b1224bf..80016a6 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -3,14 +3,15 @@ # # Trigger: manual or on push to main # Usage: -# gcloud builds submit --config cloudbuild.yaml . +# Manual: gcloud builds submit --config cloudbuild.yaml . +# With SHA: gcloud builds submit --config cloudbuild.yaml --substitutions _TAG=$(git rev-parse --short HEAD) . # ============================================================================= substitutions: _REGION: europe-west1 - _REPO: nexus + _REPO: video-accessibility _IMAGE: va-worker - _TAG: $COMMIT_SHA # replaced with actual SHA by Cloud Build; use "latest" for manual runs + _TAG: latest # overridden with $COMMIT_SHA by Cloud Build trigger; use 'latest' for manual runs steps: # ── Build Cloud Run worker image ────────────────────────────────────────── @@ -22,17 +23,14 @@ steps: - backend/Dockerfile.cloudrun - -t - ${_REGION}-docker.pkg.dev/$PROJECT_ID/${_REPO}/${_IMAGE}:${_TAG} - - -t - - ${_REGION}-docker.pkg.dev/$PROJECT_ID/${_REPO}/${_IMAGE}:latest - backend/ - # ── Push both tags ──────────────────────────────────────────────────────── + # ── Push image ──────────────────────────────────────────────────────────── - name: gcr.io/cloud-builders/docker id: push-va-worker args: - push - - --all-tags - - ${_REGION}-docker.pkg.dev/$PROJECT_ID/${_REPO}/${_IMAGE} + - ${_REGION}-docker.pkg.dev/$PROJECT_ID/${_REPO}/${_IMAGE}:${_TAG} # ── Update Cloud Run Job to use new image ───────────────────────────────── - name: gcr.io/google.com/cloudsdktool/cloud-sdk @@ -50,7 +48,6 @@ steps: images: - ${_REGION}-docker.pkg.dev/$PROJECT_ID/${_REPO}/${_IMAGE}:${_TAG} - - ${_REGION}-docker.pkg.dev/$PROJECT_ID/${_REPO}/${_IMAGE}:latest options: logging: CLOUD_LOGGING_ONLY diff --git a/docker-compose.yml b/docker-compose.yml index 5f9cf2a..0635d32 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -83,7 +83,7 @@ services: redis: condition: service_healthy ports: - - "8003:8000" + - "8010:8000" environment: # App configuration APP_ENV: ${APP_ENV:-dev} diff --git a/scripts/deploy-dev.sh b/scripts/deploy-dev.sh index 0ad574a..4a2d4e5 100755 --- a/scripts/deploy-dev.sh +++ b/scripts/deploy-dev.sh @@ -19,7 +19,7 @@ WEBROOT="/var/www/html/video-accessibility" APACHE_CONF_DIR="/etc/apache2/sites-available" APACHE_VHOST="optical-dev.oliver.solutions.conf" COMPOSE="docker compose -f docker-compose.yml -f docker-compose.prod.yml -f docker-compose.optical-dev.yml --env-file .env.production" -API_INTERNAL_PORT=8000 # host port the api container exposes +API_INTERNAL_PORT=8010 # host port the api container exposes VITE_BASE="/video-accessibility" # Only build images that run on optical-dev; heavy workers run on Cloud Run Jobs