Compare commits

..

No commits in common. "f69de09f52c7d569f7b5fce7d8d08da78f95db3f" and "93b71cbbc503db8fc6bd3f16322dbb28f7e5212d" have entirely different histories.

2 changed files with 2 additions and 6 deletions

View file

@ -2,9 +2,6 @@ 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,8 +7,7 @@
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-with-tools; default = nix;
minimal-nix = import (nix + "/docker.nix") { minimal-nix = import (nix + "/docker.nix") {
inherit pkgs; inherit pkgs;
extraPkgs = [ pkgs.nodejs ]; extraPkgs = [ pkgs.nodejs ];
@ -21,7 +20,7 @@
"org.opencontainers.image.description" = "Nix container image with nodejs"; "org.opencontainers.image.description" = "Nix container image with nodejs";
}; };
}; };
nix-with-tools = import (nix + "/docker.nix") { nix = import (nix + "/docker.nix") {
inherit pkgs; inherit pkgs;
extraPkgs = [ pkgs.nodejs pkgs.skopeo ]; extraPkgs = [ pkgs.nodejs pkgs.skopeo ];