Skip to content

Commit

Permalink
Move agent to dev docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
XxRoloxX committed Oct 11, 2024
1 parent 8215117 commit 8305b3c
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/docker-compose-build-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ jobs:
- name: Log in to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }} # Set in your GitHub secrets ()
password: ${{ secrets.DOCKER_PASSWORD }} # Set in your GitHub secrets
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Docker Compose Build
run: |
docker compose build
env:
GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} # Set in your GitHub secrets
GOOGLE_REDIRECT_URI: ${{ secrets.GOOGLE_REDIRECT_URI }} # Set in your GitHub secrets
VITE_BACKEND_URL: ${{ secrets.VITE_BACKEND_URL }} # Set in your GitHub secrets
GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
GOOGLE_REDIRECT_URI: ${{ secrets.GOOGLE_REDIRECT_URI }}
VITE_BACKEND_URL: ${{ secrets.VITE_BACKEND_URL }}

- name: Docker Compose Push
run: |
Expand Down
23 changes: 23 additions & 0 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,29 @@ services:
- "6379:6379"
volumes:
- redisdata:/data
logs-generation-service:
user: "0"
container_name: magpie-monitor-logs-generation-service
restart: on-failure
image: magpiemonitor/logs-generation-service
build:
context: ./go
dockerfile: ./docker/logs_generation/Dockerfile
environment:
- LOGS_INGESTION_QUEUE_HOST=${LOGS_INGESTION_QUEUE_HOST}
- LOGS_INGESTION_QUEUE_PORT=${LOGS_INGESTION_QUEUE_PORT}
- LOGS_INGESTION_QUEUE_USERNAME=${KAFKA_CLIENT_USERNAME}
- LOGS_INGESTION_QUEUE_PASSWORD=${KAFKA_CLIENT_PASSWORD}
develop:
watch:
- action: rebuild
path: ./go/services/logs_generation
target: /src
- action: rebuild
path: ./go/pkg
target: /src
depends_on:
- kafka

volumes:
redisdata:

0 comments on commit 8305b3c

Please sign in to comment.