Fix: GCP Artifact Registry 설정 및 Dockerfile 수정

Author: hhee4455

.github/workflows/deploy.yml

@@ -7,7 +7,8 @@ on:
 
 env:
   GCP_REGION: asia-northeast3
-  GCR_HOSTNAME: asia.gcr.io
+  AR_HOSTNAME: asia-northeast3-docker.pkg.dev
+  AR_REPOSITORY: bitcoin-pipeline
 
 jobs:
   build-and-push:
@@ -34,8 +35,8 @@ jobs:
       - name: Set up Cloud SDK
         uses: google-github-actions/setup-gcloud@v2
 
-      - name: Configure Docker for GCR
-        run: gcloud auth configure-docker ${{ env.GCR_HOSTNAME }} --quiet
+      - name: Configure Docker for Artifact Registry
+        run: gcloud auth configure-docker ${{ env.AR_HOSTNAME }} --quiet
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -49,11 +50,12 @@ jobs:
       - name: Build and push ${{ matrix.service }}
         uses: docker/build-push-action@v5
         with:
-          context: ./${{ matrix.service }}
+          context: .
+          file: ./${{ matrix.service }}/Dockerfile
           push: true
           tags: |
-            ${{ env.GCR_HOSTNAME }}/${{ secrets.GCP_PROJECT_ID }}/${{ matrix.service }}:latest
-            ${{ env.GCR_HOSTNAME }}/${{ secrets.GCP_PROJECT_ID }}/${{ matrix.service }}:${{ steps.meta.outputs.sha_short }}
+            ${{ env.AR_HOSTNAME }}/${{ secrets.GCP_PROJECT_ID }}/${{ env.AR_REPOSITORY }}/${{ matrix.service }}:latest
+            ${{ env.AR_HOSTNAME }}/${{ secrets.GCP_PROJECT_ID }}/${{ env.AR_REPOSITORY }}/${{ matrix.service }}:${{ steps.meta.outputs.sha_short }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 

collector/Dockerfile

@@ -1,6 +1,12 @@
 FROM python:3.11-slim
 WORKDIR /app
-COPY requirements.txt .
+
+# 의존성 설치
+COPY collector/requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
-COPY . .
+
+# 코드 복사 (shared 포함)
+COPY shared /app/shared
+COPY collector /app
+
 CMD ["python", "main.py"]

docker-compose.yaml

@@ -8,28 +8,26 @@ services:
       - bitcoin_network
 
   collector:
-    build: ./collector
+    image: asia-northeast3-docker.pkg.dev/poised-standard-484213-a7/bitcoin-pipeline/collector:latest
     container_name: bitcoin_collector
     depends_on:
       - redis
     env_file:
       - .env
     volumes:
       - ./keys/gcp-key.json:/keys/gcp-key.json:ro
-      - ./shared:/app/shared:ro
     networks:
       - bitcoin_network
 
   processor:
-    build: ./processor
+    image: asia-northeast3-docker.pkg.dev/poised-standard-484213-a7/bitcoin-pipeline/processor:latest
     container_name: bitcoin_processor
     depends_on:
       - redis
     env_file:
       - .env
     volumes:
       - ./keys/gcp-key.json:/keys/gcp-key.json:ro
-      - ./shared:/app/shared:ro
     networks:
       - bitcoin_network
 

processor/Dockerfile

@@ -1,6 +1,12 @@
 FROM python:3.11-slim
 WORKDIR /app
-COPY requirements.txt .
+
+# 의존성 설치
+COPY processor/requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
-COPY . .
+
+# 코드 복사 (shared 포함)
+COPY shared /app/shared
+COPY processor /app
+
 CMD ["python", "main.py"]

terraform/main.tf

@@ -78,4 +78,12 @@ resource "google_compute_firewall" "allow_iap_ssh" {
   source_ranges = ["35.235.240.0/20"]
   target_tags   = ["bitcoin-pipeline"]
   priority      = 150 # deny_ssh(200)보다 우선순위가 높아야 합니다.
+}
+
+# Artifact Registry
+resource "google_artifact_registry_repository" "bitcoin_pipeline" {
+  location      = var.region
+  repository_id = "bitcoin-pipeline"
+  description   = "Docker images for Bitcoin data pipeline"
+  format        = "DOCKER"
 }

terraform/outputs.tf

@@ -6,4 +6,9 @@ output "instance_ip" {
 output "ssh_command" {
   description = "SSH 접속 명령어 (IAP 터널 사용)"
   value       = "gcloud compute ssh bitcoin-pipeline --zone=${var.zone} --tunnel-through-iap"
+}
+
+output "artifact_registry_url" {
+  description = "Artifact Registry URL"
+  value       = "${var.region}-docker.pkg.dev/${var.project_id}/${google_artifact_registry_repository.bitcoin_pipeline.repository_id}"
 }