diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c1f3bca..e94d4d4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,13 +6,12 @@ build: stage: build tags: - nix - - podman script: - - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + - nix run ".#podman" -- login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - nix build . - - podman load -i result - - podman tag "localhost/gregs-homepage:latest" $CI_REGISTRY/greg/homepage/gregs-homepage:latest - - podman push $CI_REGISTRY/greg/homepage/gregs-homepage:latest + - nix run ".#podman" -- load -i result + - nix run ".#podman" -- tag "localhost/gregs-homepage:latest" $CI_REGISTRY/greg/homepage/gregs-homepage:latest + - nix run ".#podman" -- push $CI_REGISTRY/greg/homepage/gregs-homepage:latest deploy: stage: deploy diff --git a/flake.nix b/flake.nix index e24640e..f9e2742 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,7 @@ # This is not special, this is just flakes packages = { + inherit (pkgs) podman; default = pkgs.dockerTools.buildLayeredImage { name = "gregs-homepage"; tag = "latest";