From 7d5e6a36fd358990b7128bcd22484e3c48445d45 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 15 May 2023 14:52:35 +0000 Subject: [PATCH 1/5] chore(nix): mkPushDocker to gitlab.uniworx.de --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index c9b610c43..aaec367fc 100644 --- a/flake.nix +++ b/flake.nix @@ -134,7 +134,7 @@ mkPushDocker = imageName: dockerImage: pkgs.writeScriptBin "push-${dockerImage.imageName}" '' #!${pkgs.zsh}/bin/zsh -xe - target=''${1-docker://registry.gitlab.com/fradrive/fradrive/${imageName}:${dockerImage.imageTag}} + target=''${1-docker://registry.gitlab.uniworx.de/fradrive/fradrive/${imageName}:${dockerImage.imageTag}} [[ -n "''${1}" ]] && shift ${pkgs.skopeo}/bin/skopeo ''${@} --insecure-policy copy docker-archive://${dockerImage} ''${target} ''; From cd1045e8e9a04b40afcbcb1bd51b4dbe91dfa267 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 15 May 2023 15:44:07 +0000 Subject: [PATCH 2/5] chore(flake.nix): registry.gitlab.uniworx.de -> registry.uniworx.de --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index aaec367fc..3d84f15c7 100644 --- a/flake.nix +++ b/flake.nix @@ -134,7 +134,7 @@ mkPushDocker = imageName: dockerImage: pkgs.writeScriptBin "push-${dockerImage.imageName}" '' #!${pkgs.zsh}/bin/zsh -xe - target=''${1-docker://registry.gitlab.uniworx.de/fradrive/fradrive/${imageName}:${dockerImage.imageTag}} + target=''${1-docker://registry.uniworx.de/fradrive/fradrive/${imageName}:${dockerImage.imageTag}} [[ -n "''${1}" ]] && shift ${pkgs.skopeo}/bin/skopeo ''${@} --insecure-policy copy docker-archive://${dockerImage} ''${target} ''; From c114f08625378508808b538e1470eac3b147c181 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 15 May 2023 17:08:02 +0000 Subject: [PATCH 3/5] chore(nix): use newer skopeo --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 3d84f15c7..be93df7f2 100644 --- a/flake.nix +++ b/flake.nix @@ -120,7 +120,7 @@ (final: prev: let pkgs-recent = import nixpkgs-recent { inherit system; }; - in { inherit (pkgs-recent) dockerTools node2nix stack glibcLocalesUtf8 tzdata chromium minio minio-client; inherit (pkgs-recent.stdenv) fetchurlBoot; }) + in { inherit (pkgs-recent) dockerTools node2nix stack glibcLocalesUtf8 tzdata chromium minio minio-client skopeo; inherit (pkgs-recent.stdenv) fetchurlBoot; }) (import ./nix/maildev) haskell-nix.overlay From 05830a55b3d6bbbc9d2493744e6f276577391311 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 15 May 2023 17:10:28 +0000 Subject: [PATCH 4/5] chore(ci): use registry.uniworx.de --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c335448c3..6c8ccd9ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ workflow: default: image: - name: registry.gitlab.com/fradrive/fradrive/nix-unstable:0.2.0 + name: registry.uniworx.de/fradrive/fradrive/nix-unstable:0.2.0 variables: NIX_PATH: "nixpkgs=http://nixos.org/channels/nixos-21.05/nixexprs.tar.xz" From 760bf150d45bfec285098ec77b00bbca04953293 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 15 May 2023 17:15:53 +0000 Subject: [PATCH 5/5] chore(ci): keep pushing result images to registry.gitlab.com --- flake.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index be93df7f2..65b330f7a 100644 --- a/flake.nix +++ b/flake.nix @@ -131,10 +131,10 @@ haskellFlake = pkgs.uniworx.flake {}; - mkPushDocker = imageName: dockerImage: pkgs.writeScriptBin "push-${dockerImage.imageName}" '' + mkPushDocker = { imageName, dockerImage, defaultRegistry ? "docker://registry.uniworx.de/fradrive/fradrive" }: pkgs.writeScriptBin "push-${dockerImage.imageName}" '' #!${pkgs.zsh}/bin/zsh -xe - target=''${1-docker://registry.uniworx.de/fradrive/fradrive/${imageName}:${dockerImage.imageTag}} + target=''${1-${defaultRegistry}/${imageName}:${dockerImage.imageTag}} [[ -n "''${1}" ]] && shift ${pkgs.skopeo}/bin/skopeo ''${@} --insecure-policy copy docker-archive://${dockerImage} ''${target} ''; @@ -146,9 +146,9 @@ }; apps = haskellFlake.apps // { - pushUniworxDemoDocker = flake-utils.lib.mkApp { drv = mkPushDocker "uniworx-demo" pkgs.uniworxDemoDocker; }; - pushUniworxDocker = flake-utils.lib.mkApp { drv = mkPushDocker "uniworx" pkgs.uniworxDocker; }; - pushCIDocker = flake-utils.lib.mkApp { drv = mkPushDocker "nix-unstable" pkgs.ciDocker; }; + pushUniworxDemoDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "uniworx-demo"; dockerImage = pkgs.uniworxDemoDocker; defaultRegistry = "docker://registry.gitlab.com/fradrive/fradrive"; }; }; + pushUniworxDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "uniworx"; dockerImage = pkgs.uniworxDocker; defaultRegistry = "docker://registry.gitlab.com/fradrive/fradrive" }; }; + pushCIDocker = flake-utils.lib.mkApp { drv = mkPushDocker { imageName = "nix-unstable"; dockerImage = pkgs.ciDocker; }; }; calculateMaterializedSha = flake-utils.lib.mkApp { drv = pkgs.uniworx.stack-nix.passthru.calculateMaterializedSha; execPath = ""; }; jqChangelogJson = flake-utils.lib.mkApp { drv = pkgs.jqChangelogJson; }; };