Tweak image build to simplify

.gitlab-ci.yml

@@ -43,7 +43,6 @@ default:
       "$CI_REGISTRY"
     - cp -r ~/.nix-profile/etc/containers /etc
     - podman load -i result
-    - podman tag "localhost/${IMG}:latest" "$CI_CONTAINER_IMAGE/${IMG}:latest"
     - podman push "$CI_REGISTRY_IMAGE/${IMG}:latest"
 # "Build image":
 #   stage: build
@@ -77,8 +76,4 @@ default:
 #       }
 #       EOF
 #     - ./podman/bin/podman load -i "${IMG}.tar.gz"
-#     - >-
-#       ./podman/bin/podman tag
-#       "localhost/${IMG}:latest"
-#       "$CI_REGISTRY/greg/nixos-config/${IMG}:latest"
 #     - ./podman/bin/podman push "$CI_REGISTRY/greg/nixos-config/${IMG}:latest"

pkgs/img-bitwarden.nix

@@ -8,7 +8,7 @@
   ...
 }:
 dockerTools.buildLayeredImage {
-  name = "img-bitwarden";
+  name = "registry.thehellings.com/greg/nixos-config/img-bitwarden";
   tag = "latest";
   contents = [
     dockerTools.binSh

pkgs/img-builder.nix

@@ -34,7 +34,7 @@ let
 in
 (import "${nix.src.outPath}/docker.nix" {
   inherit pkgs;
-  name = "img-builder";
+  name = "registry.thehellings.com/greg/nixos-config/img-builder";
   tag = "latest";
 
   bundleNixpkgs = false;
@@ -44,6 +44,7 @@ in
   extraPkgs = [
     dockerTools.caCertificates
     podman
+    policy
   ];
   flake-registry = (pkgs.formats.json { }).generate "flake-registry.json" ({
     version = 2;

pkgs/img-immich.nix

@@ -6,7 +6,7 @@
   ...
 }:
 dockerTools.buildLayeredImage {
-  name = "img-immich";
+  name = "registry.thehellings.com/greg/nixos-config/img-immich";
   tag = "latest";
   contents = [
     dockerTools.binSh