mirror of
https://gitlab.com/TECHNOFAB/nix-gitlab-ci.git
synced 2025-12-12 02:00:13 +01:00
fix(image): fix digest being different for every arch aswell
This commit is contained in:
parent
786abd917c
commit
b0d24f753c
1 changed files with 20 additions and 11 deletions
31
flake.nix
31
flake.nix
|
|
@ -16,6 +16,7 @@
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs',
|
inputs',
|
||||||
config,
|
config,
|
||||||
|
system,
|
||||||
...
|
...
|
||||||
}: rec {
|
}: rec {
|
||||||
treefmt = {
|
treefmt = {
|
||||||
|
|
@ -174,17 +175,25 @@
|
||||||
finalize-script = finalizeScript;
|
finalize-script = finalizeScript;
|
||||||
image = pkgs.dockerTools.buildImage {
|
image = pkgs.dockerTools.buildImage {
|
||||||
name = "nix-ci";
|
name = "nix-ci";
|
||||||
fromImage = pkgs.dockerTools.pullImage {
|
fromImage = let
|
||||||
imageName = "nixpkgs/nix-flakes";
|
hashes = {
|
||||||
# nix run nixpkgs#nix-prefetch-docker -- --image-name nixpkgs/nix-flakes --image-tag latest --arch <amd64/arm64> --os linux
|
"aarch64-linux" = "sha256-mfTNlGOpThanLlLQ2lL1RTcHqZJWdqUafYDZMeZPWEk=";
|
||||||
imageDigest = "sha256:95bce4317c15dfab3babac5a6d19d3ed41e31a02a8aaf3d4f6639778cb763b0a";
|
"x86_64-linux" = "sha256-DMlSaP+ZVqxd9NxdFydGyfkuJdmOW5jt5iM/7cDyTEM=";
|
||||||
sha256 =
|
};
|
||||||
if pkgs.stdenv.hostPlatform.isAarch64
|
# skopeo inspect --raw docker://nixpkgs/nix-flakes
|
||||||
then "DMlSaP+ZVqxd9NxdFydGyfkuJdmOW5jt5iM/7cDyTEM="
|
digests = {
|
||||||
else "mfTNlGOpThanLlLQ2lL1RTcHqZJWdqUafYDZMeZPWEk=";
|
"aarch64-linux" = "sha256:5113a4d10dda16c30bf2e517f29a56890233d2660115003155aab1f7d279d8db";
|
||||||
finalImageName = "nixpkgs/nix-flakes";
|
"x86_64-linux" = "sha256:be07ecf4b5c19be83f63b6f5c7f21bcaf19cf722d339c99cfe2b2ad09f81a7fa";
|
||||||
finalImageTag = "latest";
|
};
|
||||||
};
|
sha256 = hashes.${system} or (throw "Unsupported system");
|
||||||
|
imageDigest = digests.${system} or (throw "Unsupported system");
|
||||||
|
in
|
||||||
|
pkgs.dockerTools.pullImage {
|
||||||
|
imageName = "nixpkgs/nix-flakes";
|
||||||
|
inherit sha256 imageDigest;
|
||||||
|
finalImageName = "nixpkgs/nix-flakes";
|
||||||
|
finalImageTag = "latest";
|
||||||
|
};
|
||||||
copyToRoot = pkgs.buildEnv {
|
copyToRoot = pkgs.buildEnv {
|
||||||
name = "image-root";
|
name = "image-root";
|
||||||
paths = [
|
paths = [
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue