From cbf54ec17caea6f165f8eeed5be2eb754d132fcf Mon Sep 17 00:00:00 2001
From: Daniel Brooks <bass_rock@me.com>
Date: Wed, 14 Aug 2024 14:30:40 -0700
Subject: [PATCH] chore(ci): adding in dockerhub login

---
 .github/workflows/user_api.yml | 16 ++++++++--------
 docker-compose.yml             | 12 +-----------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/user_api.yml b/.github/workflows/user_api.yml
index d2716d6a7..cfefee670 100644
--- a/.github/workflows/user_api.yml
+++ b/.github/workflows/user_api.yml
@@ -15,15 +15,16 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
-    
-    - name: Set up Docker Compose
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y docker-compose
+
+    - name: Login to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     # Kick off starting docker compose first, since it can take a bit
     - name: Start Docker Compose services
-      run: docker-compose up -d
+      run: docker compose up -d
     
     # While we wait for docker compose to be healthy we install node and needed packages.
     - name: Install pnpm & node
@@ -33,7 +34,6 @@ jobs:
     
     # Step 4: Wait for the services to be healthy
     - name: Wait for services to be healthy
-      run: |
-        docker-compose wait
+      run: docker compose up --wait
     - name: Run service integration tests
       run: pnpm run test-integrations --filter=user-api...
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 3c689e609..13f61d6a7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,17 +1,7 @@
 version: '3'
 services:
   ## Start Common Processes Config
-  # Note this is not the collector we use in Prod, but works for local testing
-  otlpcollector:
-    image: grafana/otel-lgtm
-    platform: linux/amd64
-    environment:
-      OTEL_METRIC_EXPORT_INTERVAL: 1
-    ports:
-      - 4317:4317 # OTLP gRPC receiver
-      - 4318:4318 # OTLP http receiver
-      - 3000:3000 # Grafana UI admin:admin, use localhost:3000 to view traces
-
+  # Note this is not the collector we use in Prod, but works for local testing & github actions
   memcached:
     image: memcached:latest
     ports: