chore: container logs to pipe

erock created pr with ps-75 on 2024-11-20T04:59:44Z

erock added ps-76 on 2024-11-20T05:01:44Z

erock changed status on 2024-11-23T03:34:33Z {"status":"accepted"}

ps-75 by erock on 2024-11-20T04:59:44Z

Range Diff ↕ rd-76


                1:  c729638 = 1:  c729638 chore: container logs to pipe


                -:  ------- > 2:  ebfa197 chore: rm build ctx from pipemgr service

ps-76 by erock on 2024-11-20T05:01:44Z

Patchset `ps-76`

Eric Bower

2024-11-20T04:59:03Z

.env.example

+3 -0

docker-compose.override.yml

+2 -0

docker-compose.prod.yml

+10 -0

docker-compose.yml

+17 -0

Eric Bower

2024-11-20T05:01:18Z

docker-compose.yml

+0 -2

.env.example link

+3 -0

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14


diff --git a/.env.example b/.env.example
index cd56239..41063b8 100644
--- a/.env.example
+++ b/.env.example
@@ -6,6 +6,9 @@ REGISTRY_URL=registry:5000
 PICO_SECRET=""
 PICO_SECRET_WEBHOOK=""
 
+PICO_SENDLOG_KEY="/key"
+PICO_PIPE_KEY="/key"
+
 MINIO_CADDYFILE=./caddy/Caddyfile.minio
 MINIO_DOMAIN=minio.dev.pico.sh
 MINIO_EMAIL=hello@pico.sh

docker-compose.override.yml link

+2 -0

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13


diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index dce05a2..b097dc7 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -74,6 +74,8 @@ services:
       - .env.example
     ports:
       - "3002:3000"
+    volumes:
+      - ./data/prose-web/data:/app/ssh_data
   prose-ssh:
     build:
       args:

docker-compose.prod.yml link

+10 -0

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28


diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 12cb24a..4d24864 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -164,6 +164,11 @@ services:
       - .env.prod
     volumes:
       - ./data/prose-ssh/data:/app/ssh_data
+    labels:
+      pipemgr: true
+    depends_on:
+      pipemgr:
+        condition: service_healthy
   prose-ssh:
     networks:
       prose:
@@ -256,6 +261,11 @@ services:
     volumes:
       - ./data/storage/data:/app/.storage
       - ./data/pgs-ssh/data:/app/ssh_data
+    labels:
+      pipemgr: true
+    depends_on:
+      pipemgr:
+        condition: service_healthy
   pgs-ssh:
     networks:
       pgs:

docker-compose.yml link

+17 -0

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28


diff --git a/docker-compose.yml b/docker-compose.yml
index 3545211..ac2afae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,6 +29,23 @@ services:
     profiles:
       - db
       - all
+  pipemgr:
+    build:
+      context: .
+    image: ghcr.io/picosh/pipemgr:latest
+    restart: always
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - ${PICO_PIPE_KEY}:/key:ro
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
+      interval: 2s
+      timeout: 5s
+      retries: 5
+      start_period: 1s
+    profiles:
+      - all
+      - log
   pastes-web:
     image: ghcr.io/picosh/pico/pastes-web:latest
     restart: always

docker-compose.yml link

+0 -2

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13


diff --git a/docker-compose.yml b/docker-compose.yml
index ac2afae..01105eb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,8 +30,6 @@ services:
       - db
       - all
   pipemgr:
-    build:
-      context: .
     image: ghcr.io/picosh/pipemgr:latest
     restart: always
     volumes: