Skip to content

Commit eebe518

Browse files
committed
ci(main): use run-fractopo-image app to run correct image
1 parent 6fa656d commit eebe518

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Load image to docker
2222
run: nix run .#load-fractopo-image
2323
- name: Test run of loaded fractopo-app container
24-
run: docker run -d --name fractopo-test -p 2718:2718 fractopo-app:vsrjfhp7gd4pgxxzhdrmnr4xglwyln35
24+
run: nix run .#run-fractopo-image -- -d --name fractopo-test -p 2718:2718
2525
- name: Wait for API to be ready
2626
run: |-
2727
for i in {1..60}; do

nix/ci.nix

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,7 @@ in
169169
}
170170
{
171171
name = "Test run of loaded fractopo-app container";
172-
run =
173-
let
174-
inherit (inputs.self.legacyPackages.x86_64-linux.fractopo-app-image-stream) imageName imageTag;
175-
in
176-
"docker run -d --name fractopo-test -p ${dockerPort}:${dockerPort} ${imageName}:${imageTag}";
172+
run = "nix run .#run-fractopo-image -- -d --name fractopo-test -p ${dockerPort}:${dockerPort}";
177173
}
178174
{
179175
name = "Wait for API to be ready";

nix/overlays.nix

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,16 @@
105105
docker image list
106106
'';
107107
};
108+
run-fractopo-image = prev.writeShellApplication {
109+
name = "run-fractopo-image";
110+
text =
111+
let
112+
inherit (final.fractopo-app-image-stream) imageName imageTag;
113+
in
114+
''
115+
docker run "$@" ${imageName}:${imageTag}
116+
'';
117+
};
108118
push-fractopo-image = prev.writeShellApplication {
109119
name = "push-fractopo-image";
110120
text =

0 commit comments

Comments
 (0)