From 93c533b13e7219efb086166ee1dafa06ebc683f8 Mon Sep 17 00:00:00 2001 From: Tamipes Date: Fri, 29 May 2026 16:15:40 +0200 Subject: [PATCH 1/2] fix: name clash `nix` --- flake.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 9850f00..f6e805d 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,8 @@ outputs = { nixpkgs, nix, self }: let pkgs = import nixpkgs { system = "x86_64-linux"; }; in { packages.x86_64-linux = rec { - default = nix; + default = nix-with-tools; + minimal-nix = import (nix + "/docker.nix") { inherit pkgs; extraPkgs = [ pkgs.nodejs ]; @@ -20,7 +21,7 @@ "org.opencontainers.image.description" = "Nix container image with nodejs"; }; }; - nix = import (nix + "/docker.nix") { + nix-with-tools = import (nix + "/docker.nix") { inherit pkgs; extraPkgs = [ pkgs.nodejs pkgs.skopeo ]; From f69de09f52c7d569f7b5fce7d8d08da78f95db3f Mon Sep 17 00:00:00 2001 From: Tamipes Date: Fri, 29 May 2026 16:11:50 +0200 Subject: [PATCH 2/2] feat: run "build and push" on push to `main` --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ed4dbf..d78b1e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,9 @@ name: Build and Push docker image on: workflow_dispatch: workflow_call: + push: + branches: + - main jobs: buildAndPush: