Merge pull request #4808 from opsmill/dga-20241031-fix-docker-compose…

…-stable

Update demo environment to work with 1.0

changelog/+fix-demo.fixed.md

@@ -0,0 +1 @@
+Update demo environment to work with Infrahub 1.0

development/docker-compose-deps-nats.yml

@@ -23,7 +23,7 @@ services:
       retries: 20
       start_period: 10s
   task-manager:
-    profiles: [dev]
+    profiles: [demo, dev]
     image: "${TASK_MANAGER_DOCKER_IMAGE:-prefecthq/prefect:3.0.3-python3.12}"
     command: prefect server start --host 0.0.0.0 --ui
     environment:
@@ -40,7 +40,7 @@ services:
     depends_on:
       - task-manager-db
   task-manager-db:
-    profiles: [dev]
+    profiles: [demo, dev]
     image: postgres:16-alpine
     environment:
       - POSTGRES_USER=postgres

development/docker-compose-deps.yml

@@ -22,7 +22,7 @@ services:
       timeout: 5s
       retries: 3
   task-manager:
-    profiles: [dev]
+    profiles: [demo, dev]
     image: "${TASK_MANAGER_DOCKER_IMAGE:-prefecthq/prefect:3.0.3-python3.12}"
     command: prefect server start --host 0.0.0.0 --ui
     environment:
@@ -37,7 +37,7 @@ services:
     depends_on:
       - task-manager-db
   task-manager-db:
-    profiles: [dev]
+    profiles: [demo, dev]
     image: postgres:16-alpine
     environment:
       - POSTGRES_USER=postgres

development/docker-compose.yml

@@ -148,47 +148,8 @@ services:
       timeout: 5s
       retries: 20
       start_period: 10s
-  infrahub-git:
-    profiles: [demo]
-    deploy:
-      mode: replicated
-      replicas: 2
-    build:
-      context: ../
-      dockerfile: development/Dockerfile
-      target: backend
-    image: "${IMAGE_NAME}:${IMAGE_VER}"
-    pull_policy: always
-    command: infrahub git-agent start --debug
-    restart: unless-stopped
-    depends_on:
-      - server
-    environment:
-      <<: *infrahub_config
-      INFRAHUB_ADDRESS: http://server:8000
-      INFRAHUB_INTERNAL_ADDRESS: "http://server:8000"
-      INFRAHUB_GIT_REPOSITORIES_DIRECTORY: "/opt/infrahub/git"
-      INFRAHUB_PRODUCTION: false
-      INFRAHUB_LOG_LEVEL: DEBUG
-      INFRAHUB_API_TOKEN: 06438eb2-8019-4776-878c-0941b1f1d1ec
-      INFRAHUB_TIMEOUT: "${INFRAHUB_TIMEOUT:-60}"
-      INFRAHUB_BROKER_ADDRESS: message-queue
-      INFRAHUB_CACHE_ADDRESS: "${INFRAHUB_CACHE_ADDRESS:-cache}"
-      INFRAHUB_DB_ADDRESS: database
-      INFRAHUB_DB_USERNAME: neo4j
-      INFRAHUB_DB_PASSWORD: admin
-      INFRAHUB_DB_PORT: 7687
-      INFRAHUB_DB_PROTOCOL: bolt
-      INFRAHUB_STORAGE_DRIVER: local
-    volumes:
-      - "git_data:/opt/infrahub/git"
-      - "git_remote_data:/remote"
-    tty: true
-    labels:
-      com.github.run_id: "${GITHUB_RUN_ID:-unknown}"
-      com.github.job: "${JOB_NAME:-unknown}"
   task-worker:
-    profiles: [dev]
+    profiles: [demo, dev]
     deploy:
       mode: replicated
       replicas: 2

tasks/demo.py

@@ -22,6 +22,7 @@
     INFRAHUB_DATABASE,
     PYTHON_VER,
     SERVICE_SERVER_NAME,
+    SERVICE_WORKER_NAME,
     Namespace,
     build_compose_files_cmd,
     execute_command,
@@ -31,8 +32,6 @@
 
 NAMESPACE = Namespace.DEFAULT
 
-SERVICE_WORKER_NAME = "infrahub-git"
-
 
 @task(optional=["database"])
 def build(