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:38:15 -05:00
parent 3a93c99748
commit 8691ee354c
Signed by: jeff
GPG key ID: 6F86035A6D97044E
2 changed files with 14 additions and 4 deletions

View file

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

View file

@ -389,6 +389,16 @@
type = "app"; type = "app";
program = "${self.packages.${system}.push-container}/bin/push-container"; 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
{
type = "app";
program = "${program}";
};
}; };
} }
) )