Compare commits

...

2 commits

Author SHA1 Message Date
f69de09f52 feat: run "build and push" on push to main
All checks were successful
Build and Push docker image / buildAndPush (push) Successful in 2m38s
2026-05-29 16:16:18 +02:00
93c533b13e fix: name clash nix 2026-05-29 16:15:40 +02:00
2 changed files with 6 additions and 2 deletions

View file

@ -2,6 +2,9 @@ name: Build and Push docker image
on: on:
workflow_dispatch: workflow_dispatch:
workflow_call: workflow_call:
push:
branches:
- main
jobs: jobs:
buildAndPush: buildAndPush:

View file

@ -7,7 +7,8 @@
outputs = { nixpkgs, nix, self }: outputs = { nixpkgs, nix, self }:
let pkgs = import nixpkgs { system = "x86_64-linux"; }; in { let pkgs = import nixpkgs { system = "x86_64-linux"; }; in {
packages.x86_64-linux = rec { packages.x86_64-linux = rec {
default = nix; default = nix-with-tools;
minimal-nix = import (nix + "/docker.nix") { minimal-nix = import (nix + "/docker.nix") {
inherit pkgs; inherit pkgs;
extraPkgs = [ pkgs.nodejs ]; extraPkgs = [ pkgs.nodejs ];
@ -20,7 +21,7 @@
"org.opencontainers.image.description" = "Nix container image with nodejs"; "org.opencontainers.image.description" = "Nix container image with nodejs";
}; };
}; };
nix = import (nix + "/docker.nix") { nix-with-tools = import (nix + "/docker.nix") {
inherit pkgs; inherit pkgs;
extraPkgs = [ pkgs.nodejs pkgs.skopeo ]; extraPkgs = [ pkgs.nodejs pkgs.skopeo ];