Skip to content

Commit ee99416

Browse files
committed
fix(ci): restore docker:build:supervisor alias and fix Dockerfile.gateway-macos syntax
The docker-build.yml reusable workflow invokes mise tasks via docker:build:$component, so the supervisor alias is required. Also fix a missing && separator in the Dockerfile.gateway-macos mkdir/touch skeleton stage that caused the server src dir to not be created.
1 parent 616336c commit ee99416

3 files changed

Lines changed: 7 additions & 21 deletions

File tree

.github/workflows/docker-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ jobs:
9393
# Enable dev-settings feature for test settings (dummy_bool, dummy_int)
9494
# used by e2e tests.
9595
EXTRA_CARGO_FEATURES: openshell-core/dev-settings
96-
run: mise run --no-prepare docker:build:${{ inputs.component }}
96+
run: mise run --no-prepare build:docker:${{ inputs.component }}

deploy/docker/Dockerfile.gateway-macos

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ RUN mkdir -p crates/openshell-core/src \
6565
crates/openshell-driver-kubernetes/src \
6666
crates/openshell-policy/src \
6767
crates/openshell-router/src \
68+
crates/openshell-server/src && \
6869
touch crates/openshell-core/src/lib.rs && \
6970
touch crates/openshell-driver-kubernetes/src/lib.rs && \
7071
printf 'fn main() {}\n' > crates/openshell-driver-kubernetes/src/main.rs && \

tasks/docker.toml

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,16 @@ depends = [
1111
]
1212
hide = true
1313

14-
["docker:build"]
15-
description = "Alias for build:docker"
16-
depends = ["build:docker"]
17-
hide = true
18-
1914
["build:docker:ci"]
2015
description = "Build the CI Docker image"
2116
run = "tasks/scripts/docker-build-ci.sh"
2217
hide = true
2318

24-
["docker:build:ci"]
25-
description = "Alias for build:docker:ci"
26-
depends = ["build:docker:ci"]
27-
hide = true
28-
2919
["build:docker:gateway"]
3020
description = "Build the gateway Docker image"
3121
run = "tasks/scripts/docker-build-image.sh gateway"
3222
hide = true
3323

34-
["docker:build:gateway"]
35-
description = "Alias for build:docker:gateway"
36-
depends = ["build:docker:gateway"]
37-
hide = true
38-
3924
["build:docker:supervisor"]
4025
description = "Build the supervisor Docker image"
4126
run = "tasks/scripts/docker-build-image.sh supervisor"
@@ -46,6 +31,11 @@ description = "Build the k3s cluster image (component images pulled at runtime f
4631
run = "tasks/scripts/docker-build-image.sh cluster"
4732
hide = true
4833

34+
["docker:build:gateway"]
35+
description = "Alias for build:docker:gateway"
36+
depends = ["build:docker:gateway"]
37+
hide = true
38+
4939
["docker:build:cluster"]
5040
description = "Alias for build:docker:cluster"
5141
depends = ["build:docker:cluster"]
@@ -56,11 +46,6 @@ description = "Build multi-arch cluster image and push to a registry"
5646
run = "tasks/scripts/docker-publish-multiarch.sh"
5747
hide = true
5848

59-
["docker:build:cluster:multiarch"]
60-
description = "Alias for build:docker:cluster:multiarch"
61-
depends = ["build:docker:cluster:multiarch"]
62-
hide = true
63-
6449
["docker:cleanup"]
6550
description = "Remove stale images, volumes, and build cache not used by the current cluster"
6651
run = "scripts/docker-cleanup.sh --force"

0 commit comments

Comments
 (0)