Skip to content

Commit 5b0630f

Browse files
oliversalzburgoliversalzburg
committed
feat: Protocol cleanup
1 parent a81238f commit 5b0630f

File tree

13 files changed

+112
-93
lines changed

13 files changed

+112
-93
lines changed

‎.github/workflows/nightly.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
is_latest: false
154154
push: true
155155

156-
publish-ksa-backend:
156+
publish-ka-backend:
157157
name: 🔹 Publish Backend
158158
needs:
159159
- qa
@@ -168,17 +168,17 @@ jobs:
168168
security-events: write
169169
uses: oliversalzburg/workflows/.github/workflows/publish-oci.yml@main
170170
with:
171-
artifact-name: ksa-backend-output
171+
artifact-name: ka-backend-output
172172
attest: false
173173
containerfile: packages/kitten-analysts/backend.Containerfile
174174
image_description: Kitten Science Analytics Backend
175-
image_name: kitten-science/ksa-backend
175+
image_name: kitten-science/ka-backend
176176
image_tag: nightly
177-
image_title: ksa-backend
177+
image_title: ka-backend
178178
is_latest: false
179179
push: true
180180

181-
publish-ksa-game:
181+
publish-ka-game:
182182
name: 🔹 Publish Game
183183
needs:
184184
- qa
@@ -193,17 +193,17 @@ jobs:
193193
security-events: write
194194
uses: oliversalzburg/workflows/.github/workflows/publish-oci.yml@main
195195
with:
196-
artifact-name: ksa-game-output
196+
artifact-name: ka-game-output
197197
attest: false
198198
containerfile: packages/kitten-analysts/game.Containerfile
199199
image_description: Kittens Game with Kitten Science Analytics
200-
image_name: kitten-science/ksa-game
200+
image_name: kitten-science/ka-game
201201
image_tag: nightly
202-
image_title: ksa-game
202+
image_title: ka-game
203203
is_latest: false
204204
push: true
205205

206-
publish-ksa-ui:
206+
publish-ka-ui:
207207
name: 🔹 Publish UI
208208
needs:
209209
- qa
@@ -218,12 +218,12 @@ jobs:
218218
security-events: write
219219
uses: oliversalzburg/workflows/.github/workflows/publish-oci.yml@main
220220
with:
221-
artifact-name: ksa-ui-output
221+
artifact-name: ka-ui-output
222222
attest: false
223223
containerfile: packages/kitten-analysts/ui.Containerfile
224224
image_description: Headless Kittens Game
225-
image_name: kitten-science/ksa-ui
225+
image_name: kitten-science/ka-ui
226226
image_tag: nightly
227-
image_title: ksa-ui
227+
image_title: ka-ui
228228
is_latest: false
229229
push: true

‎.github/workflows/pre-release.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ jobs:
156156
is_latest: false
157157
push: true
158158

159-
publish-ksa-backend:
159+
publish-ka-backend:
160160
name: 🔹 Publish Backend
161161
needs:
162162
- qa
@@ -171,17 +171,17 @@ jobs:
171171
security-events: write
172172
uses: oliversalzburg/workflows/.github/workflows/publish-oci.yml@main
173173
with:
174-
artifact-name: ksa-backend-output
174+
artifact-name: ka-backend-output
175175
attest: false
176176
containerfile: packages/kitten-analysts/backend.Containerfile
177177
image_description: Kitten Science Analytics Backend
178-
image_name: kitten-science/ksa-backend
178+
image_name: kitten-science/ka-backend
179179
image_tag: next
180-
image_title: ksa-backend
180+
image_title: ka-backend
181181
is_latest: false
182182
push: true
183183

184-
publish-ksa-game:
184+
publish-ka-game:
185185
name: 🔹 Publish Game
186186
needs:
187187
- qa
@@ -196,17 +196,17 @@ jobs:
196196
security-events: write
197197
uses: oliversalzburg/workflows/.github/workflows/publish-oci.yml@main
198198
with:
199-
artifact-name: ksa-game-output
199+
artifact-name: ka-game-output
200200
attest: false
201201
containerfile: packages/kitten-analysts/game.Containerfile
202202
image_description: Kittens Game with Kitten Science Analytics
203-
image_name: kitten-science/ksa-game
203+
image_name: kitten-science/ka-game
204204
image_tag: next
205-
image_title: ksa-game
205+
image_title: ka-game
206206
is_latest: false
207207
push: true
208208

209-
publish-ksa-ui:
209+
publish-ka-ui:
210210
name: 🔹 Publish UI
211211
needs:
212212
- qa
@@ -221,12 +221,12 @@ jobs:
221221
security-events: write
222222
uses: oliversalzburg/workflows/.github/workflows/publish-oci.yml@main
223223
with:
224-
artifact-name: ksa-ui-output
224+
artifact-name: ka-ui-output
225225
attest: false
226226
containerfile: packages/kitten-analysts/ui.Containerfile
227227
image_description: Headless Kittens Game
228-
image_name: kitten-science/ksa-ui
228+
image_name: kitten-science/ka-ui
229229
image_tag: next
230-
image_title: ksa-ui
230+
image_title: ka-ui
231231
is_latest: false
232232
push: true

‎.github/workflows/qa.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,37 +80,37 @@ jobs:
8080
packages/*/output
8181
containerfile: packages/devcontainer/Containerfile
8282
working-directory: packages/devcontainer
83-
qa-ksa-backend:
83+
qa-ka-backend:
8484
# We don't need to run this on Renovate PRs. We will already test the `renovate/foo` branch.
8585
if: github.event_name != 'pull_request' || github.actor != 'renovate[bot]'
8686
name: 🔹 QA Backend
8787
uses: oliversalzburg/workflows/.github/workflows/qa-nodejs-oci.yml@main
8888
with:
89-
artifact-name: ksa-backend-output
89+
artifact-name: ka-backend-output
9090
artifact-contents: |
9191
node_modules
9292
packages/*/output
9393
containerfile: packages/kitten-analysts/backend.Containerfile
9494
working-directory: packages/kitten-analysts
95-
qa-ksa-game:
95+
qa-ka-game:
9696
# We don't need to run this on Renovate PRs. We will already test the `renovate/foo` branch.
9797
if: github.event_name != 'pull_request' || github.actor != 'renovate[bot]'
9898
name: 🔹 QA Game
9999
uses: oliversalzburg/workflows/.github/workflows/qa-nodejs-oci.yml@main
100100
with:
101-
artifact-name: ksa-game-output
101+
artifact-name: ka-game-output
102102
artifact-contents: |
103103
node_modules
104104
packages/*/output
105105
containerfile: packages/kitten-analysts/game.Containerfile
106106
working-directory: packages/kitten-analysts
107-
qa-ksa-ui:
107+
qa-ka-ui:
108108
# We don't need to run this on Renovate PRs. We will already test the `renovate/foo` branch.
109109
if: github.event_name != 'pull_request' || github.actor != 'renovate[bot]'
110110
name: 🔹 QA UI
111111
uses: oliversalzburg/workflows/.github/workflows/qa-nodejs-oci.yml@main
112112
with:
113-
artifact-name: ksa-ui-output
113+
artifact-name: ka-ui-output
114114
artifact-contents: |
115115
node_modules
116116
packages/*/output
@@ -122,9 +122,9 @@ jobs:
122122
- qa-commit
123123
- qa
124124
- qa-devcontainer
125-
- qa-ksa-backend
126-
- qa-ksa-game
127-
- qa-ksa-ui
125+
- qa-ka-backend
126+
- qa-ka-game
127+
- qa-ka-ui
128128
name: QA Passed
129129
# We don't need to run this on Renovate PRs. We will already test the `renovate/foo` branch.
130130
if: github.event_name != 'pull_request' || github.actor != 'renovate[bot]'

‎contrib/docker-compose.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3.7"
22

33
services:
44
backend:
5-
image: ghcr.io/kitten-science/ksa-backend:next
5+
image: ghcr.io/kitten-science/ka-backend:next
66
ports:
77
# KGNet Interface
88
- "7780:7780/tcp"
@@ -11,8 +11,8 @@ services:
1111
# Kitten Analysts Websocket
1212
- "9093:9093"
1313
# Kittens Game Browser UI
14-
# Port is exposed by ksa-game. We publish it here, because all services
15-
# share their network interface with ksa-backend.
14+
# Port is exposed by ka-game. We publish it here, because all services
15+
# share their network interface with ka-backend.
1616
- "9080:8080/tcp"
1717

1818
volumes:
@@ -23,12 +23,12 @@ services:
2323

2424
# Actual Kittens Game instance
2525
game:
26-
image: ghcr.io/kitten-science/ksa-game:next
26+
image: ghcr.io/kitten-science/ka-game:next
2727
network_mode: service:backend
2828

2929
# Headless container
3030
ui:
31-
image: ghcr.io/kitten-science/ksa-ui:next
31+
image: ghcr.io/kitten-science/ka-ui:next
3232
network_mode: service:backend
3333
volumes:
3434
- type: volume

‎packages/kitten-analysts/scripts/build-container.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ main() {
1717
echo "Building Game container..."
1818
buildah bud \
1919
--file ./game.Containerfile \
20-
--tag localhost/ksa-game:latest \
20+
--tag localhost/ka-game:latest \
2121
../..
2222

2323
echo "Building Backend container..."
2424
buildah bud \
2525
--file ./backend.Containerfile \
26-
--tag localhost/ksa-backend:latest \
26+
--tag localhost/ka-backend:latest \
2727
../..
2828

2929
echo "Building UI container..."
3030
buildah bud \
3131
--file ./ui.Containerfile \
32-
--tag localhost/ksa-ui:latest \
32+
--tag localhost/ka-ui:latest \
3333
../..
3434

3535
echo "Done."

‎packages/kitten-analysts/scripts/rebuild-container.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ main() {
1919
buildah bud \
2020
--file ./game.Containerfile \
2121
--no-cache \
22-
--tag localhost/ksa-game:latest \
22+
--tag localhost/ka-game:latest \
2323
../..
2424

2525
echo "Re-Building Backend container..."
2626
buildah bud \
2727
--file ./backend.Containerfile \
2828
--no-cache \
29-
--tag localhost/ksa-backend:latest \
29+
--tag localhost/ka-backend:latest \
3030
../..
3131

3232
echo "Re-Building UI container..."
3333
buildah bud \
3434
--file ./ui.Containerfile \
3535
--no-cache \
36-
--tag localhost/ksa-ui:latest \
36+
--tag localhost/ka-ui:latest \
3737
../..
3838

3939
echo "Done."

‎packages/kitten-analysts/scripts/run-container.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ main() {
1515
yarn build:all
1616

1717
echo "Removing previous containers..."
18-
podman kill ksa-game || true
19-
podman kill ksa-backend || true
20-
podman kill ksa-ui || true
18+
podman kill ka-game || true
19+
podman kill ka-backend || true
20+
podman kill ka-ui || true
2121

22-
podman rm ksa-game || true
23-
podman rm ksa-backend || true
24-
podman rm ksa-ui || true
22+
podman rm ka-game || true
23+
podman rm ka-backend || true
24+
podman rm ka-ui || true
2525

2626
echo "Previous containers removed or non-existent."
2727

@@ -51,21 +51,21 @@ main() {
5151
echo "Running new containers..."
5252
podman run \
5353
--detach \
54-
--name ksa-game \
54+
--name ka-game \
5555
--pod kittenscience \
56-
localhost/ksa-game:latest
56+
localhost/ka-game:latest
5757

5858
podman run \
5959
--detach \
60-
--name ksa-backend \
60+
--name ka-backend \
6161
--pod kittenscience \
62-
localhost/ksa-backend:latest
62+
localhost/ka-backend:latest
6363

6464
podman run \
6565
--detach \
66-
--name ksa-ui \
66+
--name ka-ui \
6767
--pod kittenscience \
68-
localhost/ksa-ui:latest
68+
localhost/ka-ui:latest
6969

7070
echo "Containers running."
7171
}

‎packages/kitten-analysts/scripts/stop-container.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ cd "$(dirname "$0")"
1111

1212
main() {
1313
echo "Removing containers..."
14-
podman kill ksa-game || true
15-
podman kill ksa-backend || true
16-
podman kill ksa-ui || true
14+
podman kill ka-game || true
15+
podman kill ka-backend || true
16+
podman kill ka-ui || true
1717

18-
podman rm ksa-game || true
19-
podman rm ksa-backend || true
20-
podman rm ksa-ui || true
18+
podman rm ka-game || true
19+
podman rm ka-backend || true
20+
podman rm ka-ui || true
2121

2222
echo "Containers removed or non-existent."
2323

0 commit comments

Comments
 (0)