Fix the tag & push loop

tenzir · Apr 25, 2023 · 91ee5b2 · 91ee5b2
1 parent 4c581fd
commit 91ee5b2
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 21 deletions.
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -123,7  123,7 @@ jobs:
         run: |
           # Expand the registries arrays and output each entry together with
           # the corresponding edition.
-          jq -r '.editions[] | .name as $name | .registries[]? // .registries | [ $name, . ] | join(" ")' \
           jq -r '.editions[] | .name as $name | .registries[]? | [ $name, . ] | join(" ")' \
             <<< '${{ inputs.config }}' | while read -r name registry; do
             for tag in ${{ join(fromJSON(inputs.config).tags, ' ') }}; do
               docker tag "tenzir/${name}:latest" "${registry}/tenzir/${name}:${tag}"

diff --git a/flake.nix b/flake.nix
@@ -95,8  95,6 @@
           vast-ce-static = pkgs.pkgsStatic.vast-ce;
           vast-ee = pkgs.vast-ee;
           vast-ee-static = pkgs.pkgsStatic.vast-ee;
-          vast-manager = pkgs.vast-manager;
-          vast-manager-static = pkgs.pkgsStatic.vast-manager;
           vast-integration-test-shell = pkgs.mkShell {
             packages = pkgs.vast-integration-test-deps;
           };
@@ -115,8  113,6 @@
         apps.vast-ce-static = flake-utils.lib.mkApp {drv = packages.vast-ce-static;};
         apps.vast-ee = flake-utils.lib.mkApp {drv = packages.vast-ee;};
         apps.vast-ee-static = flake-utils.lib.mkApp {drv = packages.vast-ee-static;};
-        apps.vast-manager = flake-utils.lib.mkApp {drv = packages.vast-manager;};
-        apps.vast-manager-static = flake-utils.lib.mkApp {drv = packages.vast-manager-static;};
         apps.stream-vast-image = stream-image {
           name = "tenzir/vast";
           pkg = self.packages.${system}.vast;
@@ -141,14  137,6 @@
           name = "tenzir/vast-ee-slim";
           pkg = self.packages.${system}.vast-ee-static;
         };
-        apps.stream-vast-manager-image = stream-image {
-          name = "tenzir/vast-manager";
-          pkg = self.packages.${system}.vast-manager;
-        };
-        apps.stream-vast-manager-slim-image = stream-image {
-          name = "tenzir/vast-manager-slim";
-          pkg = self.packages.${system}.vast-manager-static;
-        };
         apps.default = apps.vast;
         devShell = import ./shell.nix {inherit pkgs;};
         formatter = pkgs.alejandra;

diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -167,14  167,6 @@ in {
       ps.matcher
       ps.netflow
     ]);
-  vast-manager = let
-    pkg = final.vast.override {
-      pname = "vast-manager";
-    };
-  in
-    pkg.withPlugins (ps: [
-      ps.fleet
-    ]);
   vast-integration-test-deps = let
     py3 = prev.python3.withPackages (ps:
       with ps; [