From d87a4e8414c0459989c70f88a3f0d46a42dfe6d2 Mon Sep 17 00:00:00 2001
From: Jack Jackson <scubbojj@gmail.com>
Date: Tue, 20 Sep 2022 02:23:52 -0700
Subject: [PATCH] Switch to using Gitea Docker registry

---
 .drone.yml               | 29 +++++------------------------
 kubernetes-resources.yml |  2 +-
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 9c8641a..03f5695 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -31,23 +31,6 @@ steps:
 #      -   echo $files
 #      -   exit 1 # TODO - and alerting via Matrix!
 #      - fi
-  - name: copy-cert-into-place
-    image: busybox
-    volumes:
-      - name: docker-cert-persistence
-        path: /etc/docker/certs.d/
-    commands:
-      # https://stackoverflow.com/questions/72823418/how-to-make-drone-docker-plugin-use-self-signed-certs
-      - mkdir -p /etc/docker/certs.d/docker-registry.scubbo.org:8843
-      - cp /registry_cert.crt /etc/docker/certs.d/docker-registry.scubbo.org:8843/ca.crt
-  - name: check-cert-persists-between-stages
-    image: alpine
-    volumes:
-      - name: docker-cert-persistence
-        path: /etc/docker/certs.d/
-    commands:
-      - apk add curl
-      - curl https://docker-registry.scubbo.org:8843/v2/_catalog --cacert /etc/docker/certs.d/docker-registry.scubbo.org:8843/ca.crt
   - name: build-blog
     image: alpine
     # Very unlikely to need updates, and pulling images seems slow on this setup -
@@ -62,14 +45,15 @@ steps:
       - hugo --source blog
   - name: push-built-image
     image: plugins/docker
-    volumes:
-      - name: docker-cert-persistence
-        path: /etc/docker/certs.d/
     settings:
-      repo: docker-registry.scubbo.org:8843/scubbo/blog_nginx
+      registry: gitea.scubbo.org
+      repo: gitea.scubbo.org/scubbo/blog_nginx
       tags: built_in_ci
       debug: true
       launch_debug: true
+      username: scubbo
+      password:
+        from_secret: gitea_password
   - name: update_blog_deployment
     # I've tried using https://github.com/sinlead/drone-kubectl and
     # https://github.com/honestbee/drone-kubernetes, but neither is built for arm64
@@ -103,6 +87,3 @@ steps:
         from_secret: k8s_cert
       kubernetesToken:
         from_secret: k8s_token
-volumes:
-  - name: docker-cert-persistence
-    temp: {}
diff --git a/kubernetes-resources.yml b/kubernetes-resources.yml
index bbadfde..acbeb7b 100644
--- a/kubernetes-resources.yml
+++ b/kubernetes-resources.yml
@@ -34,7 +34,7 @@ spec:
       # (Unique to rancher/k3s. On traditional k8s installs, I suspect https://github.com/kubernetes/kubernetes/issues/43924
       # is the way)
       - name: app
-        image: "docker-registry.scubbo.org:8843/scubbo/blog_nginx:built_in_ci"
+        image: "gitea.scubbo.org/scubbo/blog_nginx:built_in_ci"
         imagePullPolicy: 'Always'
         resources:
           requests: