fix drone build
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
Jeffrey C. Ollie 2023-08-17 13:42:58 -05:00
parent 8691ee354c
commit 9d3313d5c5
Signed by: jeff
GPG key ID: 6F86035A6D97044E
2 changed files with 10 additions and 13 deletions

View file

@ -19,9 +19,9 @@ steps:
image: docker.io/jcollie/nixos-runner:latest
pull: always
commands:
- set
# - set
- nix run .#login
# - echo -n "$${PLUGIN_PASSWORD}" | podman login --username $${PLUGIN_USERNAME} --password-stdin $${PLUGIN_REGISTRY}
- echo -n "$${PLUGIN_PASSWORD}" | podman login --username $${PLUGIN_USERNAME} --password-stdin $${PLUGIN_REGISTRY}
- nix build .#nixos-runner
# - nix run .#push-container -- result
- podman load --input result | sed -n -e "s/Loaded image:.\\(.*\\)/\\1/p" > loaded-image
@ -30,7 +30,7 @@ steps:
- podman tag "$$(<loaded-image)" "$${PLUGIN_REGISTRY}/${PLUGIN_REPOSITORY}:$${DRONE_BUILD_NUMBER}-$${DRONE_COMMIT_SHA:0:8}"
- podman tag "$$(<loaded-image)" "$${PLUGIN_REGISTRY}/${PLUGIN_REPOSITORY}:latest"
- podman images
- podman push "$${PLUGIN_REGISTRY}/$${PLUGIN_REPOSITORY}:${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:8}"
- podman push "$${PLUGIN_REGISTRY}/$${PLUGIN_REPOSITORY}:$${DRONE_BUILD_NUMBER}-$${DRONE_COMMIT_SHA:0:8}"
- podman push "$${PLUGIN_REGISTRY}/$${PLUGIN_REPOSITORY}:latest"
- podman logout "$${PLUGIN_REGISTRY}"
env:

View file

@ -383,21 +383,18 @@
];
executable = true;
};
login-script = pkgs.writeScriptBin "login-script" ''
echo -n "''${PLUGIN_PASSWORD}" | ${pkgs.podman}/bin/podman login --username "''${PLUGIN_USERNAME}" --password-stdin "''${PLUGIN_REGISTRY}"
'';
};
apps = {
push-container = {
type = "app";
program = "${self.packages.${system}.push-container}/bin/push-container";
};
login =
let
program = pkgs.writeScript "program" ''
echo -n "''${PLUGIN_PASSWORD}" | ${pkgs.podman}/bin/podman login --username "''${PLUGIN_USERNAME}" --password-stdin "''${PLUGIN_REGISTRY}"
'';
in
{
login = {
type = "app";
program = "${program}";
program = "${self.packages.${system}.login-script}/bin/login-script";
};
};
}