Skip to content

Commit 00db882

Browse files
HyteqHyteq
authored andcommitted
feat: biome in api2, bit more progress
2 parents 0e3edcf + 6fd0d74 commit 00db882

7 files changed

Lines changed: 26 additions & 16 deletions

File tree

infrastructure/aqua/deploy-aqua.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,18 @@
5555
group: "{{postgres_gid}}"
5656
recurse: yes
5757
when: inventory_hostname in groups['clickhouse']
58+
59+
60+
- name: Create Data Dir For redis
61+
become: true
62+
ansible.builtin.file:
63+
path: "{{redis_dir_name}}"
64+
state: directory
65+
mode: "0775"
66+
owner: "{{postgres_uid}}"
67+
group: "{{postgres_gid}}"
68+
recurse: yes
69+
when: inventory_hostname in groups['redis']
5870

5971

6072
- name: Create Data Dir For Clickhouse Logs

infrastructure/aqua/docker-compose.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ services:
7878
timeout: 10s
7979
networks:
8080
- databuddy_aqua
81+
volumes:
82+
- "{{redis_dir_name}}:/data"
8183
stop_grace_period: 20m
8284
stop_signal: SIGKILL
8385
expose:

infrastructure/ci/deploy-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
woodpecker_github: true
1818
woodpecker_github_client_id: "Ov23ctD4OqYIRfs7TS2n"
1919
woodpecker_github_client_secret: "c74a1df9ba42d3e16fc96dc7c7739f97347f66a8"
20-
woodpecker_agent_secret: "1eed3577eafef3faad25cf073c3c5cc8e479d7f1950280e0c48fc472059cd094"
20+
woodpecker_agent_secret: "db9a01ecf4e2754dc30080f0d8c7fd90d30d3f4655cd59e5be38f1cb791bedc3"
2121
woodpecker_plugins_privileged: woodpeckerci/plugin-docker-buildx:6.0.0,woodpeckerci/plugin-ansible
2222
#woodpecker agent vars
2323

infrastructure/ci/docker-compose.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ services:
4949
woodpecker-agent:
5050
image: woodpeckerci/woodpecker-agent:v3
5151
command: agent
52-
restart: unless-stopped
52+
restart: always
5353
depends_on:
5454
- woodpecker-server
5555
volumes:
@@ -72,9 +72,8 @@ services:
7272
order: stop-first
7373
restart_policy:
7474
condition: on-failure
75-
delay: 5s
76-
max_attempts: 3
77-
window: 120s
75+
delay: 15s
76+
window: 30s
7877
placement:
7978
constraints:
8079
- node.labels.ci-worker==true

infrastructure/ingress/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ networks:
99
services:
1010
reverse-proxy:
1111
# Use Traefik for routing and certificate handling.
12-
image: traefik:v3.4.0
12+
image: traefik:v3.4.1
1313
restart: unless-stopped
1414
command:
1515
- "--api.insecure=true"

infrastructure/registry/deploy-registry.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
- hosts: infra-nodes
33
name: "Deploy Docker Registry"
44
remote_user: ubuntu
5-
gather_facts: yes
5+
gather_facts: no
66
become: yes
77
vars:
88
working_dir_name: "registry"
99
registry_host: "registry.databuddy.cc"
10-
registry_data_dir: "/tmp/data/registry"
10+
registry_data_dir: "/tmp/registry/data"
1111

1212
tasks:
1313

infrastructure/registry/docker-compose.yaml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
version: '3'
22
services:
33
registry:
4-
image: registry:latest
4+
image: registry:3.0.0
55
command: /etc/distribution/config.yml
66
expose:
77
- 5000
88
environment:
9-
REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY: /tmp/data
109
REGISTRY_AUTH: htpasswd
1110
REGISTRY_AUTH_HTPASSWD_REALM: Registry
1211
REGISTRY_AUTH_HTPASSWD_PATH: /run/secrets/registry_password_file
1312
REGISTRY_STORAGE_DELETE_ENABLED: 1
13+
OTEL_TRACES_EXPORTER: none
14+
REGISTRY_LOG_LEVEL: info
1415
secrets:
1516
- registry_password_file
17+
volumes:
18+
- "{{registry_data_dir}}:/var/lib/registry"
1619
restart: always
1720
networks:
1821
- databuddy_ingress
@@ -40,12 +43,6 @@ services:
4043
- "traefik.http.routers.registry.entrypoints=websecure"
4144
- "traefik.http.services.registry.loadbalancer.server.port=5000"
4245
- "traefik.docker.network=databuddy_ingress"
43-
healthcheck:
44-
test: wget --no-verbose --tries=1 --spider http://localhost:5000 || exit 1
45-
interval: 120s
46-
timeout: 60s
47-
start_period: 180s
48-
retries: 20
4946

5047
networks:
5148
databuddy_ingress:

0 commit comments

Comments
 (0)