Compare commits
7 Commits
553e2f8898
...
feat/issue
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b1ff624c98 | ||
|
|
fed427dc4a | ||
|
|
cf78ab2f8e | ||
|
|
c8883d0e40 | ||
|
|
7154092547 | ||
|
|
ada3a3ccaf | ||
|
|
8cf3a2a726 |
@@ -305,6 +305,7 @@ jobs:
|
|||||||
MAIL_PORT=1025
|
MAIL_PORT=1025
|
||||||
APP_MAIL_FROM=noreply@local
|
APP_MAIL_FROM=noreply@local
|
||||||
IMPORT_HOST_DIR=/tmp/dummy-import
|
IMPORT_HOST_DIR=/tmp/dummy-import
|
||||||
|
COMPOSE_NETWORK_NAME=test-idem-archiv-net
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
- name: Bring up minio
|
- name: Bring up minio
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ jobs:
|
|||||||
docker compose \
|
docker compose \
|
||||||
-f docker-compose.observability.yml \
|
-f docker-compose.observability.yml \
|
||||||
--env-file .env.staging \
|
--env-file .env.staging \
|
||||||
up -d --wait
|
up -d --wait --remove-orphans
|
||||||
|
|
||||||
- name: Reload Caddy
|
- name: Reload Caddy
|
||||||
# Apply any committed Caddyfile changes before smoke-testing the
|
# Apply any committed Caddyfile changes before smoke-testing the
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ jobs:
|
|||||||
docker compose \
|
docker compose \
|
||||||
-f docker-compose.observability.yml \
|
-f docker-compose.observability.yml \
|
||||||
--env-file .env.production \
|
--env-file .env.production \
|
||||||
up -d --wait
|
up -d --wait --remove-orphans
|
||||||
|
|
||||||
- name: Reload Caddy
|
- name: Reload Caddy
|
||||||
# See nightly.yml — same rationale and mechanism: DooD job containers
|
# See nightly.yml — same rationale and mechanism: DooD job containers
|
||||||
|
|||||||
@@ -29,6 +29,20 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<java.version>21</java.version>
|
<java.version>21</java.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
<dependencyManagement>
|
||||||
|
<dependencies>
|
||||||
|
<!-- opentelemetry-spring-boot-starter:2.27.0 was built against opentelemetry-api:1.61.0,
|
||||||
|
but Spring Boot 4.0.0 BOM only manages 1.55.0 (missing GlobalOpenTelemetry.getOrNoop()).
|
||||||
|
Import the core OTel BOM here to override it before the Spring Boot BOM applies. -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.opentelemetry</groupId>
|
||||||
|
<artifactId>opentelemetry-bom</artifactId>
|
||||||
|
<version>1.61.0</version>
|
||||||
|
<type>pom</type>
|
||||||
|
<scope>import</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
|||||||
@@ -184,7 +184,7 @@ services:
|
|||||||
- obs-net
|
- obs-net
|
||||||
|
|
||||||
obs-glitchtip:
|
obs-glitchtip:
|
||||||
image: glitchtip/glitchtip:v4
|
image: glitchtip/glitchtip:6.1.6
|
||||||
container_name: obs-glitchtip
|
container_name: obs-glitchtip
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
@@ -207,7 +207,7 @@ services:
|
|||||||
- obs-net
|
- obs-net
|
||||||
|
|
||||||
obs-glitchtip-worker:
|
obs-glitchtip-worker:
|
||||||
image: glitchtip/glitchtip:v4
|
image: glitchtip/glitchtip:6.1.6
|
||||||
container_name: obs-glitchtip-worker
|
container_name: obs-glitchtip-worker
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: ./bin/run-celery-with-beat.sh
|
command: ./bin/run-celery-with-beat.sh
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
networks:
|
networks:
|
||||||
archiv-net:
|
archiv-net:
|
||||||
driver: bridge
|
driver: bridge
|
||||||
name: archiv-net
|
name: ${COMPOSE_NETWORK_NAME:-archiv-net}
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
postgres-data:
|
postgres-data:
|
||||||
@@ -213,10 +213,11 @@ services:
|
|||||||
APP_MAIL_FROM: ${APP_MAIL_FROM:-noreply@raddatz.cloud}
|
APP_MAIL_FROM: ${APP_MAIL_FROM:-noreply@raddatz.cloud}
|
||||||
SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH: ${MAIL_SMTP_AUTH:-true}
|
SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH: ${MAIL_SMTP_AUTH:-true}
|
||||||
SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE: ${MAIL_STARTTLS_ENABLE:-true}
|
SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE: ${MAIL_STARTTLS_ENABLE:-true}
|
||||||
|
OTEL_EXPORTER_OTLP_ENDPOINT: http://tempo:4317
|
||||||
networks:
|
networks:
|
||||||
- archiv-net
|
- archiv-net
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "wget -qO- http://localhost:8080/actuator/health | grep -q UP || exit 1"]
|
test: ["CMD-SHELL", "wget -qO- http://localhost:8081/actuator/health | grep -q UP || exit 1"]
|
||||||
interval: 15s
|
interval: 15s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 10
|
retries: 10
|
||||||
|
|||||||
@@ -95,6 +95,6 @@ grafana.archiv.raddatz.cloud {
|
|||||||
}
|
}
|
||||||
|
|
||||||
glitchtip.archiv.raddatz.cloud {
|
glitchtip.archiv.raddatz.cloud {
|
||||||
header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload"
|
import security_headers
|
||||||
reverse_proxy 127.0.0.1:3002
|
reverse_proxy 127.0.0.1:3002
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user