Now try using the build image

2025-11-25 20:29:05 -06:00
parent 81223079c2
commit df8912d05d
1 changed files with 43 additions and 22 deletions
@@ -27,7 +27,7 @@ default:
  stage: build
  tags:
    - kubernetes
-  image: "nixos/nix:latest"
+  image: "$CI_REGISTRY_IMAGE/img-builder:latest"
  parallel: &parallel
    matrix:
      - IMG:
@@ -35,28 +35,49 @@ default:
          - img-immich
          - img-builder
  script:
-    - nix --extra-experimental-features "nix-command flakes" build ".#${IMG}"
-    - cp -L result "${IMG}.tar.gz"
+    - nix build ".#${IMG}"
    - >-
-      nix
-      --extra-experimental-features "nix-command flakes"
-      build "nixpkgs#podman"
-      --out-link podman
-    - >-
-      ./podman/bin/podman login
+      podman login
      -u "$CI_REGISTRY_USER"
      -p "$CI_REGISTRY_PASSWORD"
      "$CI_REGISTRY"
-    - mkdir -p /etc/containers/
-    - |-
-      cat << EOF > /etc/containers/policy.json
-      {
-        "default": [{"type": "insecureAcceptAnything"}]
-      }
-      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"
+    - 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
+#   tags:
+#     - kubernetes
+#   image: "nixos/nix:latest"
+#   parallel: &parallel
+#     matrix:
+#       - IMG:
+#           - img-bitwarden
+#           - img-immich
+#           - img-builder
+#   script:
+#     - nix --extra-experimental-features "nix-command flakes" build ".#${IMG}"
+#     - cp -L result "${IMG}.tar.gz"
+#     - >-
+#       nix
+#       --extra-experimental-features "nix-command flakes"
+#       build "nixpkgs#podman"
+#       --out-link podman
+#     - >-
+#       ./podman/bin/podman login
+#       -u "$CI_REGISTRY_USER"
+#       -p "$CI_REGISTRY_PASSWORD"
+#       "$CI_REGISTRY"
+#     - mkdir -p /etc/containers/
+#     - |-
+#       cat << EOF > /etc/containers/policy.json
+#       {
+#         "default": [{"type": "insecureAcceptAnything"}]
+#       }
+#       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"