Merge pull request #1325 from keboola/michaljurecko-fix-dev-image

Fix dev image
keboola · May 10, 2023 · f81a0ee · f81a0ee
2 parents a32515e + 32b8baf
commit f81a0ee
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,10 +14,18 @@ services:
       # For all
       - TEST_KBC_PROJECTS
       # For Templates API
-      - TEMPLATES_API_STORAGE_API_HOST
+      - TEMPLATES_API_STORAGE_API_HOST=connection.keboola.com
+      - TEMPLATES_API_LISTEN_ADDRESS=0.0.0.0:8000
+      - TEMPLATES_API_METRICS_LISTEN_ADDRESS=0.0.0.0:9000
+      - TEMPLATES_API_PUBLIC_ADDRESS=http://localhost:8000
       # For Buffer API
-      - BUFFER_API_STORAGE_API_HOST
-      - BUFFER_API_PUBLIC_ADDRESS
+      - BUFFER_API_STORAGE_API_HOST=connection.keboola.com
+      - BUFFER_API_LISTEN_ADDRESS=0.0.0.0:8001
+      - BUFFER_API_METRICS_LISTEN_ADDRESS=0.0.0.0:9001
+      - BUFFER_API_PUBLIC_ADDRESS=http://localhost:8001
+      # For Buffer Worker
+      - BUFFER_WORKER_STORAGE_API_HOST=connection.keboola.com
+      - BUFFER_WORKER_METRICS_LISTEN_ADDRESS=0.0.0.0:9002
       # Disable DataDog integration
       - TEMPLATES_API_DATADOG_ENABLED=false
       - BUFFER_API_DATADOG_ENABLED=false
@@ -44,9 +52,15 @@ services:
       - BUFFER_WORKER_ETCD_PASSWORD=toor
       - BUFFER_WORKER_ETCD_NAMESPACE=buffer
     ports:
-      - "8000:8000" # make run-templates-api
-      - "8001:8001" # make run-buffer-api
+      # Templates API
+      - "8000:8000" # API
       - "9000:9000" # metrics
+      # Buffer API
+      - "8001:8001" # API
+      - "9001:9001" # metrics
+      # Buffer Worker
+      - "9002:9002" # metrics
+      # Go docs
       - "6060:6060"
   # Same etcd is used for all services, but with different namespace
   etcd:

diff --git a/provisioning/buffer/dev/.air-api.toml b/provisioning/buffer/dev/.air-api.toml
@@ -3,7 +3,7 @@ tmp_dir = "target/.watcher"
 
 [build]
   bin = "./target/buffer/api"
-  args_bin = ["--listen-address=http://0.0.0.0:8001", "--public-address=http://localhost:8001"]
+  args_bin = []
   cmd = "make build-buffer-api"
   delay = 2000
   exclude_dir = ["internal/pkg/service/buffer/api/gen"]

diff --git a/provisioning/templates-api/dev/.air-api.toml b/provisioning/templates-api/dev/.air-api.toml
@@ -3,7 +3,7 @@ tmp_dir = "target/.watcher"
 
 [build]
   bin = "./target/templates/api"
-  args_bin = ["--listen-address=http://0.0.0.0:8000", "--public-address=http://localhost:8000"]
+  args_bin = []
   cmd = "make build-templates-api"
   delay = 2000
   exclude_dir = ["internal/pkg/service/templates/api/gen"]

diff --git a/scripts/tools.sh b/scripts/tools.sh
@@ -33,7 +33,7 @@ fi
 # air - code changes watcher
 if ! command -v air &> /dev/null
 then
-  curl -sSfL https://raw.githubusercontent.com/cosmtrek/air/master/install.sh | sh -s -- -b $(go env GOPATH)/bin
+  go install github.com/cosmtrek/air@latest
 fi
 
 # godoc