From e3b60baa7274bc1d64d3a29f2b96f774b345118b Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Tue, 30 Mar 2021 21:28:43 +0100
Subject: [PATCH] Remove Docker push.

As part of #4, I'm removing all of the OpenShift-ness. While I do that, let's keep Twitterchiver as is.
---
 ci-root.nix               |  4 +---
 docker-images.nix         | 35 -----------------------------------
 nix/gitlab-ci/default.nix |  7 -------
 3 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 docker-images.nix

diff --git a/ci-root.nix b/ci-root.nix
index fb8b4dcbea..e7c7cc7cf3 100644
--- a/ci-root.nix
+++ b/ci-root.nix
@@ -10,8 +10,6 @@ let
   ciMachines = prefixAttrs "machine" depot.ops.nixos.systems;
   ciPackages = prefixAttrs "pkg" (builtins.removeAttrs depot.nix.pkgs [ "grafana-plugins" "windows" ]);
   ciGrafanaPlugins = prefixAttrs "pkg-grafana-plugins" depot.nix.pkgs.grafana-plugins;
-  #ciWindows = prefixAttrs "pkg-windows" depot.nix.pkgs.windows;
-  ciDocker = prefixAttrs "docker" ((import ./docker-images.nix).images);
   ciWeb = prefixAttrs "web" depot.web;
 
   ciOther = prefixAttrs "other" {
@@ -21,4 +19,4 @@ let
     systemPathJSON = depot.ops.nixos.systemPathJSON;
   };
 in
-pkgs.linkFarm "ci" (ciMachines ++ ciPackages ++ ciGrafanaPlugins ++ ciDocker ++ ciWeb ++ ciOther)
+pkgs.linkFarm "ci" (ciMachines ++ ciPackages ++ ciGrafanaPlugins ++ ciWeb ++ ciOther)
diff --git a/docker-images.nix b/docker-images.nix
deleted file mode 100644
index 4a86abbb25..0000000000
--- a/docker-images.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-# SPDX-FileCopyrightText: 2020 Luke Granger-Brown <depot@lukegb.com>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-let
-  depot = (import ./default.nix {});
-  pkgs = depot.third_party.nixpkgs;
-  lib = pkgs.lib;
-  images = {
-    "registry.apps.k8s.lukegb.tech/twitterchiver/archiver:latest" = depot.go.twitterchiver.archiver.dockerImage;
-    "registry.apps.k8s.lukegb.tech/twitterchiver/viewer:latest" = depot.go.twitterchiver.viewer.dockerImage;
-    "registry.apps.k8s.lukegb.tech/twitterchiver/relatedfetcher:latest" = depot.go.twitterchiver.relatedfetcher.dockerImage;
-    "registry.apps.k8s.lukegb.tech/lukegb-openshiftauth-test/example:latest" = depot.go.openshiftauth.example.dockerImage;
-    "registry.apps.k8s.lukegb.tech/depotcron/update_nixpkgs:latest" = depot.ops.maint.update_nixpkgs;
-  };
-
-  baseName = p: builtins.elemAt (builtins.match "^[a-z0-9]+-([^.]+).*$" (baseNameOf p)) 0;
-
-  crane = "${depot.nix.pkgs.crane}/bin/crane";
-  pushCommands = lib.mapAttrsToList (name: value: ''
-    ${pkgs.gzip}/bin/gunzip -c ${value} > /tmp/push.tar
-    ${crane} push /tmp/push.tar ${name}
-  '') images;
-
-  authCommands = lib.mapAttrsToList (name: value: ''
-    ${crane} auth login ${name} -u "${value.user}" -p "${value.password}"
-  '') depot.ops.secrets.deployer.dockerRegistryAuth;
-in
-((pkgs.writeShellScript "push-images" ''
-  ${lib.concatStringsSep "\n" authCommands}
-
-  ${lib.concatStringsSep "\n" pushCommands}
-'') // {
-  images = images;
-})
diff --git a/nix/gitlab-ci/default.nix b/nix/gitlab-ci/default.nix
index 55be73926f..2717d0f549 100644
--- a/nix/gitlab-ci/default.nix
+++ b/nix/gitlab-ci/default.nix
@@ -22,13 +22,6 @@ let
       };
       tags = [ "cacher" ];
     };
-
-    docker-push = {
-      stage = "deploy";
-      # This requires a sizable amount of temporary disk, so we run it on cacher instead.
-      tags = [ "cacher" ];
-      script = "./hack/dockerpush.sh";
-    };
   } // (lib.mapAttrs deployStage deployMachs);
 
   deployMachs = lib.filterAttrs (name: cfg: cfg.config.my.deploy.enable) depot.ops.nixos.systemConfigs;