Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ docker compose logs app | grep 'Sign in as'

```bash
git fetch --tags
git checkout v0.4.0
git checkout v0.5.0
docker compose pull
docker compose stop app
docker compose up -d
Expand All @@ -93,7 +93,7 @@ tar -C "$(grep ^CARINA_KEYS_DIR= .env | cut -d= -f2)" -cf keys-$(date +%Y%m%d).t
## Helm

```bash
helm install carina oci://ghcr.io/newworldorg/charts/pyxis --version 0.4.0 -n tv --create-namespace -f values.yaml
helm install carina oci://ghcr.io/newworldorg/charts/pyxis --version 0.5.0 -n tv --create-namespace -f values.yaml
```

値の一覧と説明は `charts/pyxis/values.yaml` にあります。\
Expand All @@ -103,6 +103,7 @@ driver は特権コンテナなので、名前空間の Pod Security は `privil

| Pyxis | Carina | Puppis | Vela | PostgreSQL | Caddy |
| --- | --- | --- | --- | --- | --- |
| 0.5.0 | v2.0.0 | v0.2.0 | v1.3.0 | 18.6(Debian) | 2.11.7 |
| 0.4.0 | v2.0.0 | v0.1.1 | v1.2.0 | 18.6(Debian) | 2.11.7 |
| 0.3.0 | v2.0.0 | v0.1.1 | v1.1.0 | 18.6(Debian) | 2.11.7 |
| 0.2.0 | v2.0.0 | v0.1.1 | v1.1.0 | 18.6(Alpine) | 2.11.7 |
Expand Down
8 changes: 4 additions & 4 deletions charts/pyxis/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: pyxis
description: A recording server for Japanese digital broadcasting, with Puppis, Carina and Vela pinned to a verified set of image versions
type: application
version: 0.4.0
appVersion: 0.4.0
version: 0.5.0
appVersion: 0.5.0
kubeVersion: ">=1.25.0-0"
home: https://github.com/NewWorldOrg/Pyxis
sources:
Expand All @@ -20,6 +20,6 @@ keywords:
annotations:
# この版が固定するイメージの組。compose.yml と values.yaml の image と同じ値にする
images/carina-app: ghcr.io/newworldorg/carina:v2.0.0
images/puppis-driver: ghcr.io/newworldorg/puppis:v0.1.1
images/vela: ghcr.io/newworldorg/vela:v1.2.0
images/puppis-driver: ghcr.io/newworldorg/puppis:v0.2.0
images/vela: ghcr.io/newworldorg/vela:v1.3.0
images/postgres: postgres:18.6-trixie
4 changes: 2 additions & 2 deletions charts/pyxis/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ driver:
# driver のイメージ
repository: ghcr.io/newworldorg/puppis
# driver のイメージのタグ。compose.yml と同じ版にする
tag: v0.1.1
tag: v0.2.0
# イメージを引く条件
pullPolicy: IfNotPresent
# driver.json の中身をそのまま書く。socketGroupId はチャートが carina.gid で入れ、socketPath は既定 (/run/carina/driver.sock) のままにする
Expand Down Expand Up @@ -136,7 +136,7 @@ vela:
# 画面のイメージ
repository: ghcr.io/newworldorg/vela
# 画面のイメージのタグ。compose.yml と同じ版にする
tag: v1.2.0
tag: v1.3.0
# イメージを引く条件
pullPolicy: IfNotPresent
# 画面だけに当てる nodeSelector。空なら上の nodeSelector を使う
Expand Down
4 changes: 2 additions & 2 deletions compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ services:
condition: service_started

driver:
image: ghcr.io/newworldorg/puppis:v0.1.1
image: ghcr.io/newworldorg/puppis:v0.2.0
logging: *logging
# 要求による停止は 0、それ以外は 70 で終わるので on-failure は使わない
restart: unless-stopped
Expand All @@ -114,7 +114,7 @@ services:
start_interval: 10s

vela:
image: ghcr.io/newworldorg/vela:v1.2.0
image: ghcr.io/newworldorg/vela:v1.3.0
logging: *logging
restart: unless-stopped
environment:
Expand Down
Loading