Skip to content

Commit a006559

Browse files
Lock file maintenance
1 parent 6a9b6af commit a006559

3 files changed

Lines changed: 37 additions & 23 deletions

File tree

modules/docker/codezero/vendor/.env

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,18 @@ VELORUM_JWT_SECRET=088cfc7a7fc2b07696d8ee5e1ea9d642
7070
# token cost multiplier for this model
7171
# VELORUM_MODEL_GPT5_TOKEN_COST=1
7272

73+
# OpenTelemetry
74+
OPENTELEMETRY_ENABLED=false
75+
OPENTELEMETRY_GRPC_HOST=http://localhost:4317
76+
OPENTELEMETRY_LOGS_HTTP_ENDPOINT=http://localhost:4318/v1/logs
77+
OPENTELEMETRY_METRICS_HTTP_ENDPOINT=http://localhost:4318/v1/metrics
78+
OPENTELEMETRY_TRACES_HTTP_ENDPOINT=http://localhost:4318/v1/traces
79+
80+
# OPENTELEMETRY_SERVICE_NAME_SAGITTARIUS_WEB=sagittarius-web
81+
# OPENTELEMETRY_SERVICE_NAME_SAGITTARIUS_CABLE=sagittarius-cable
82+
# OPENTELEMETRY_SERVICE_NAME_SAGITTARIUS_GRPC=sagittarius-grpc
83+
# OPENTELEMETRY_SERVICE_NAME_SAGITTARIUS_BACKGROUND=sagittarius-background
84+
7385
# Internal config options
7486
SAGITTARIUS_RAILS_HOST=sagittarius-rails-web
7587
SAGITTARIUS_RAILS_PORT=3000

modules/docker/codezero/vendor/docker-compose.yml

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,9 @@ services:
4040
INITIAL_ROOT_PASSWORD: ${INITIAL_ROOT_PASSWORD}
4141
INITIAL_ROOT_MAIL: ${INITIAL_ROOT_MAIL}
4242
INITIAL_RUNTIME_TOKEN: ${INITIAL_RUNTIME_TOKEN}
43+
SAGITTARIUS_CONFIG_FILES: /tmp/generated-configs/sagittarius.sagittarius.yml,/tmp/generated-configs/sagittarius.sagittarius-web.yml
4344
volumes:
4445
- generated-configs:/tmp/generated-configs:ro
45-
entrypoint: |
46-
sh -c "
47-
cp /tmp/generated-configs/sagittarius.sagittarius.yml config/sagittarius.yml
48-
exec bin/docker-entrypoint ./bin/rails server
49-
"
5046
restart: unless-stopped
5147
healthcheck:
5248
test: ["CMD-SHELL", "curl --fail http://localhost:3000/health/liveness"]
@@ -63,11 +59,12 @@ services:
6359
condition: service_healthy
6460
volumes:
6561
- generated-configs:/tmp/generated-configs:ro
66-
entrypoint: |
67-
sh -c "
68-
cp /tmp/generated-configs/sagittarius.sagittarius.yml config/sagittarius.yml
69-
exec bin/docker-entrypoint bundle exec good_job
70-
"
62+
environment:
63+
SAGITTARIUS_CONFIG_FILES: /tmp/generated-configs/sagittarius.sagittarius.yml,/tmp/generated-configs/sagittarius.sagittarius-background.yml
64+
command:
65+
- bundle
66+
- exec
67+
- good_job
7168
restart: unless-stopped
7269
profiles:
7370
- ide
@@ -79,11 +76,10 @@ services:
7976
condition: service_healthy
8077
volumes:
8178
- generated-configs:/tmp/generated-configs:ro
82-
entrypoint: |
83-
sh -c "
84-
cp /tmp/generated-configs/sagittarius.sagittarius.yml config/sagittarius.yml
85-
exec bin/docker-entrypoint ./bin/grpc_server
86-
"
79+
environment:
80+
SAGITTARIUS_CONFIG_FILES: /tmp/generated-configs/sagittarius.sagittarius.yml,/tmp/generated-configs/sagittarius.sagittarius-grpc.yml
81+
command:
82+
- bin/grpc_server
8783
restart: unless-stopped
8884
profiles:
8985
- ide
@@ -95,11 +91,13 @@ services:
9591
condition: service_healthy
9692
volumes:
9793
- generated-configs:/tmp/generated-configs:ro
98-
entrypoint: |
99-
sh -c "
100-
cp /tmp/generated-configs/sagittarius.sagittarius.yml config/sagittarius.yml
101-
exec bin/docker-entrypoint bundle exec puma config.cable.ru
102-
"
94+
environment:
95+
SAGITTARIUS_CONFIG_FILES: /tmp/generated-configs/sagittarius.sagittarius.yml,/tmp/generated-configs/sagittarius.sagittarius-cable.yml
96+
command:
97+
- bundle
98+
- exec
99+
- puma
100+
- config.cable.ru
103101
restart: unless-stopped
104102
profiles:
105103
- ide
@@ -130,7 +128,7 @@ services:
130128
- ide_velorum
131129

132130
nginx:
133-
image: nginx:1.31.1-alpine-slim
131+
image: nginx:1.31.1-alpine-otel
134132
depends_on:
135133
config-generator:
136134
condition: service_completed_successfully
@@ -148,6 +146,10 @@ services:
148146
entrypoint: |
149147
sh -c "
150148
cp /tmp/generated-configs/nginx.default.conf /etc/nginx/conf.d/default.conf
149+
if [ -s /tmp/generated-configs/nginx.otel.conf ]; then
150+
sed -i '1i load_module modules/ngx_otel_module.so;' /etc/nginx/nginx.conf
151+
cp /tmp/generated-configs/nginx.otel.conf /etc/nginx/conf.d/otel.conf
152+
fi
151153
nginx -t
152154
exec nginx -g 'daemon off;'
153155
"

vendir.lock.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: vendir.k14s.io/v1alpha1
22
directories:
33
- contents:
44
- git:
5-
commitTitle: 'fix: correct file path for aquila config'
6-
sha: 31806fcb5b983282045c3ff32e9b2c1d732b90cd
5+
commitTitle: 'Merge pull request #954 from code0-tech/pyxis/update/sagittarius...'
6+
sha: f0bbd75713e4a4be506e9484a444636a91468bbe
77
path: .
88
path: modules/docker/codezero/vendor
99
kind: LockConfig

0 commit comments

Comments
 (0)