lanterno/beats - Change UMCATODOPQUDCUN5MZIZI24GBQJXCBNMRXBH6BIKVSQNTXDKY3IQC

Switch from GCR to Artifact Registry for Docker images

Migrated from eu.gcr.io to europe-docker.pkg.dev
Created Artifact Registry repository via Terraform
Updated cloudbuild.yaml to use Artifact Registry format
Added Makefile targets for viewing build logs
Updated terraform README with build log instructions

Created by Ahmed Elghareeb on November 1, 2025

UMCATODOPQUDCUN5MZIZI24GBQJXCBNMRXBH6BIKVSQNTXDKY3IQC

Dependencies

In channels

main

Change contents

Replacement in terraform/main.tf at line 18 [4.3823]

B:BD[3.4296] → [3.4296:4323]

  gcr_region = "eu.gcr.io"

[3.4296]

[4.4242]

  # Use Artifact Registry instead of GCR
  artifact_registry_location = "europe"
  artifact_registry_repo      = "docker"

Replacement in terraform/main.tf at line 22 [4.3823]

B:BD[4.4245] → [3.4324:4420]

  # Build image URL
  built_image = "${local.gcr_region}/${var.project_id}/${var.service_name}"

[4.4245]

[3.4420]

  # Build image URL for Artifact Registry
  built_image = "${local.artifact_registry_location}-docker.pkg.dev/${var.project_id}/${local.artifact_registry_repo}/${var.service_name}"

Insertion in terraform/main.tf at line 34 [4.3823]

[3.4595]

# Enable Artifact Registry API
resource "google_project_service" "artifactregistry" {
  service = "artifactregistry.googleapis.com"
  project = var.project_id
  disable_on_destroy = false
}

Insertion in terraform/main.tf at line 84 [4.3823]

[3.5484]

}
# Artifact Registry repository for Docker images
resource "google_artifact_registry_repository" "docker" {
  location      = local.artifact_registry_location
  repository_id = local.artifact_registry_repo
  description   = "Docker repository for ${var.service_name}"
  format        = "DOCKER"
  project       = var.project_id
  depends_on = [
    google_project_service.artifactregistry,
  ]

Replacement in terraform/main.tf at line 117 [4.3823]

B:BD[3.5909] → [3.5909:6015]

    _GCR_REGION  = local.gcr_region
    _IMAGE_NAME  = var.service_name
    _PROJECT_ID  = var.project_id

[3.5909]

[3.6015]

    _REGISTRY_LOCATION = local.artifact_registry_location
    _REPO_NAME         = local.artifact_registry_repo
    _IMAGE_NAME        = var.service_name
    _PROJECT_ID        = var.project_id

Insertion in terraform/main.tf at line 127 [4.3823]

[3.6134]

    google_project_service.artifactregistry,
    google_artifact_registry_repository.docker,

File addition: README.md (----------)

[4.2]

# Terraform Infrastructure for Beats API
## Rerunning Builds
While Terraform manages the Cloud Build trigger configuration, it doesn't directly rerun builds. Here are your options:
### Option 1: Manual Trigger via gcloud CLI (Recommended)
1. Get the trigger ID from Terraform outputs:
```bash
cd terraform
terraform output cloud_build_trigger_id
```
2. Trigger the build manually:
```bash
gcloud builds triggers run <TRIGGER_ID> \
  --project=beats-476914 \
  --branch=main
```
Or use the trigger name directly:
```bash
gcloud builds triggers run beats-api-build \
  --project=beats-476914 \
  --branch=main
```
### Option 2: Push to GitHub
The trigger is configured to automatically run on pushes to the `main` branch. Simply push any commit:
```bash
git push origin main
```
### Option 3: View Build History
Check recent builds:
```bash
gcloud builds list --project=beats-476914 --limit=10
```
Or use the Makefile:
```bash
make build-status
```
### Option 4: View Build Logs in Terminal
**View logs for the latest build:**
```bash
make build-logs
```
**Stream logs in real-time (follow mode):**
```bash
make build-logs-follow
```
**View logs for a specific build ID:**
```bash
make build-logs-id BUILD_ID=<build-id>
# Example:
make build-logs-id BUILD_ID=7b0567e9-b97c-402b-956d-e41fc0c5d9ee
```
**Using gcloud directly:**
```bash
# Get build ID from status
BUILD_ID=$(gcloud builds list --project=beats-476914 --limit=1 --format="value(id)")
# View logs
gcloud builds log $BUILD_ID --project=beats-476914
# Stream logs (real-time)
gcloud builds log $BUILD_ID --project=beats-476914 --stream
```
### Option 5: Trigger via Cloud Console
1. Go to [Cloud Build Triggers](https://console.cloud.google.com/cloud-build/triggers)
2. Find your trigger (`beats-api-build`)
3. Click "Run" → Select branch → "Run"

Replacement in cloudbuild.yaml at line 7 [3.7999]

B:BD[3.8142] → [2.27:94]

      - '${_GCR_REGION}/${_PROJECT_ID}/${_IMAGE_NAME}:$COMMIT_SHA'

[3.8142]

[3.8208]

      - '${_REGISTRY_LOCATION}-docker.pkg.dev/${_PROJECT_ID}/${_REPO_NAME}/${_IMAGE_NAME}:$COMMIT_SHA'

Replacement in cloudbuild.yaml at line 9 [3.7999]

B:BD[3.8221] → [3.8221:8283]

      - '${_GCR_REGION}/${_PROJECT_ID}/${_IMAGE_NAME}:latest'

[3.8221]

[3.8283]

      - '${_REGISTRY_LOCATION}-docker.pkg.dev/${_PROJECT_ID}/${_REPO_NAME}/${_IMAGE_NAME}:latest'

Replacement in cloudbuild.yaml at line 17 [3.7999]

B:BD[3.8412] → [2.95:162]

      - '${_GCR_REGION}/${_PROJECT_ID}/${_IMAGE_NAME}:$COMMIT_SHA'

[3.8412]

[3.8478]

      - '${_REGISTRY_LOCATION}-docker.pkg.dev/${_PROJECT_ID}/${_REPO_NAME}/${_IMAGE_NAME}:$COMMIT_SHA'

Replacement in cloudbuild.yaml at line 24 [3.7999]

B:BD[3.8590] → [3.8590:8652]

      - '${_GCR_REGION}/${_PROJECT_ID}/${_IMAGE_NAME}:latest'

[3.8590]

[3.8652]

      - '${_REGISTRY_LOCATION}-docker.pkg.dev/${_PROJECT_ID}/${_REPO_NAME}/${_IMAGE_NAME}:latest'

Replacement in cloudbuild.yaml at line 27 [3.7999]
B:BD[3.8802] → [3.8802:8827]
```
# Images to store in GCR
```
[3.8802]
[3.8827]
```
# Images to store in Artifact Registry
```

Replacement in cloudbuild.yaml at line 29 [3.7999]

B:BD[3.8835] → [2.163:226]

∅:D[2.226] → [3.8897:8955]

B:BD[3.8897] → [3.8897:8955]

  - '${_GCR_REGION}/${_PROJECT_ID}/${_IMAGE_NAME}:$COMMIT_SHA'
  - '${_GCR_REGION}/${_PROJECT_ID}/${_IMAGE_NAME}:latest'

[3.8835]

[3.8955]

  - '${_REGISTRY_LOCATION}-docker.pkg.dev/${_PROJECT_ID}/${_REPO_NAME}/${_IMAGE_NAME}:$COMMIT_SHA'
  - '${_REGISTRY_LOCATION}-docker.pkg.dev/${_PROJECT_ID}/${_REPO_NAME}/${_IMAGE_NAME}:latest'

Insertion in Makefile at line 28 [6.9338]

[5.51103]


# Cloud Build targets
trigger-build:
	cd terraform && gcloud builds triggers run beats-api-build \
		--project=beats-476914 \
		--branch=main
build-status:
	gcloud builds list --project=beats-476914 --limit=5
build-logs:
	@BUILD_ID=$$(gcloud builds list --project=beats-476914 --limit=1 --format="value(id)" | head -1); \
	if [ -z "$$BUILD_ID" ]; then \
		echo "No builds found"; \
	else \
		echo "Viewing logs for build: $$BUILD_ID"; \
		gcloud builds log $$BUILD_ID --project=beats-476914; \
	fi
build-logs-follow:
	@BUILD_ID=$$(gcloud builds list --project=beats-476914 --limit=1 --format="value(id)" | head -1); \
	if [ -z "$$BUILD_ID" ]; then \
		echo "No builds found"; \
	else \
		echo "Streaming logs for build: $$BUILD_ID (Press Ctrl+C to stop)"; \
		gcloud builds log $$BUILD_ID --project=beats-476914 --stream; \
	fi
build-logs-id:
	@if [ -z "$(BUILD_ID)" ]; then \
		echo "Usage: make build-logs-id BUILD_ID=<build-id>"; \
		echo "Example: make build-logs-id BUILD_ID=7b0567e9-b97c-402b-956d-e41fc0c5d9ee"; \
	else \
		gcloud builds log $(BUILD_ID) --project=beats-476914; \
	fi
build-trigger-id:
	cd terraform && terraform output cloud_build_trigger_id