Skip to content

Commit 9be0bea

Browse files
committed
Refactor Docker workflow for ARM64 image build and deployment; enhance BloodSugarMonitor and TemperatureMonitor UI for improved readability
1 parent c755ea3 commit 9be0bea

4 files changed

Lines changed: 22 additions & 53 deletions

File tree

.github/workflows/docker-image.yml

Lines changed: 10 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -11,58 +11,25 @@ on:
1111
# Then a new version will be deployed on the self-hosted runner.
1212

1313
jobs:
14-
build:
15-
runs-on: ubuntu-latest
16-
steps:
17-
- name: Checkout code
18-
uses: actions/checkout@v4
19-
20-
- name: Set up Docker Buildx
21-
uses: docker/setup-buildx-action@v3
22-
23-
- name: Build ARM64 image
24-
uses: docker/build-push-action@v5
25-
with:
26-
context: .
27-
file: ./HomeSpeaker.Server2/Dockerfile
28-
platforms: linux/arm64
29-
tags: homespeakerserver2:latest
30-
outputs: type=docker,dest=/tmp/homespeaker-arm64.tar
31-
cache-from: type=gha
32-
cache-to: type=gha,mode=max
33-
34-
- name: Upload image artifact
35-
uses: actions/upload-artifact@v4
36-
with:
37-
name: homespeaker-arm64-image
38-
path: /tmp/homespeaker-arm64.tar
39-
retention-days: 1
40-
41-
deploy:
42-
needs: build
14+
rpi4:
4315
runs-on: [self-hosted, "${{ matrix.runner}}" ]
4416
strategy:
4517
matrix:
4618
runner: [rpi4, rpi42]
4719

4820
steps:
49-
- name: Checkout code
50-
uses: actions/checkout@v4
51-
52-
- name: Download image artifact
53-
uses: actions/download-artifact@v4
54-
with:
55-
name: homespeaker-arm64-image
56-
path: /tmp/
57-
58-
- name: Load Docker image
59-
run: docker load < /tmp/homespeaker-arm64.tar
60-
21+
- uses: actions/checkout@v3
22+
23+
- name: Docker compose pull
24+
run: docker-compose pull
25+
6126
- name: Docker compose down
6227
run: docker-compose down
63-
28+
6429
- name: Docker compose up
6530
env:
31+
COMPOSE_DOCKER_CLI_BUILD: 1
32+
DOCKER_BUILDKIT: 1
6633
GOVEE_API_KEY: ${{ secrets.GOVEE_API_KEY }}
67-
run: docker-compose up -d --remove-orphans
34+
run: docker-compose up -d --build --remove-orphans
6835

HomeSpeaker.WebAssembly/Components/BloodSugarMonitor.razor

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,17 @@
9595
<style> .blood-sugar-card .blood-sugar-display {
9696
margin: 0.25rem 0;
9797
line-height: 0.9;
98-
}
99-
.blood-sugar-card .blood-sugar-display .display-1 {
100-
font-size: 4rem !important;
98+
} .blood-sugar-card .blood-sugar-display .display-1 {
99+
font-size: 3.6rem !important;
101100
text-shadow: 1px 1px 2px rgba(0,0,0,0.3);
102101
}
103102
104103
/* Extra large on smaller screens for better visibility */
105104
@@media (max-width: 1024px) {
106105
.blood-sugar-card .blood-sugar-display .display-1 {
107-
font-size: 5rem !important;
106+
font-size: 4.5rem !important;
108107
}
109-
} .blood-sugar-card .trend-display {
108+
}.blood-sugar-card .trend-display {
110109
margin: 0.25rem 0;
111110
line-height: 1.1;
112111
}

HomeSpeaker.WebAssembly/Components/TemperatureMonitor.razor

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,15 @@
123123
<style> .temperature-card .temperature-display {
124124
margin: 0.25rem 0;
125125
line-height: 0.9;
126-
}.temperature-card .temperature-display .display-1 {
127-
font-size: 4rem !important;
126+
} .temperature-card .temperature-display .display-1 {
127+
font-size: 3.6rem !important;
128128
text-shadow: 1px 1px 2px rgba(0,0,0,0.3);
129129
}
130130
131131
/* Extra large on smaller screens for better visibility */
132132
@@media (max-width: 1024px) {
133133
.temperature-card .temperature-display .display-1 {
134-
font-size: 5rem !important;
134+
font-size: 4.5rem !important;
135135
}
136136
}
137137

docker-compose.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ version: '3.4'
22
services:
33
homespeaker.server2:
44
container_name: homespeaker
5-
image: homespeakerserver2:latest
5+
image: homespeakerserver2
6+
build:
7+
context: .
8+
dockerfile: HomeSpeaker.Server2/Dockerfile
69
restart: unless-stopped
710
devices:
811
- /dev/snd:/dev/snd
@@ -42,4 +45,4 @@ services:
4245
speakernet:
4346

4447
networks:
45-
speakernet:
48+
speakernet:

0 commit comments

Comments
 (0)