From e5e1987bd121ceb0905b55f15d1de0a59624316a Mon Sep 17 00:00:00 2001
From: Carl Pearson <me@carlpearson.net>
Date: Fri, 29 Aug 2025 09:18:38 -0600
Subject: [PATCH] ci: ubuntu

---
 .ci/ubuntu_setup_docker.sh        | 17 +++++++++++++++++
 .gitea/workflows/build-deploy.yml | 11 +++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 .ci/ubuntu_setup_docker.sh

diff --git a/.ci/ubuntu_setup_docker.sh b/.ci/ubuntu_setup_docker.sh
new file mode 100644
index 0000000..5117357
--- /dev/null
+++ b/.ci/ubuntu_setup_docker.sh
@@ -0,0 +1,17 @@
+# Add Docker's official GPG key:
+sudo apt-get update
+sudo apt-get install ca-certificates curl
+sudo install -m 0755 -d /etc/apt/keyrings
+sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+sudo chmod a+r /etc/apt/keyrings/docker.asc
+
+# Add the repository to Apt sources:
+echo \
+  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+  $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \
+  sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+sudo apt-get update
+
+sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+
+sudo usermod -aG docker $(whoami)
diff --git a/.gitea/workflows/build-deploy.yml b/.gitea/workflows/build-deploy.yml
index 6dca8fc..38414c6 100644
--- a/.gitea/workflows/build-deploy.yml
+++ b/.gitea/workflows/build-deploy.yml
@@ -35,7 +35,7 @@ jobs:
 
       - name: Install prerequisites
         run: |
-          bash .ci/debian_setup_docker.sh
+          bash .ci/ubuntu_setup_docker.sh
 
       - name: Build Docker image
         run: |
@@ -45,9 +45,16 @@ jobs:
             --tag ${{ env.SLUG }}:${{ env.DATE }} \
             --tag ${{ env.SLUG }}:latest
 
+      # - name: Deploy to Container Registry
+      #   if: github.ref == 'refs/heads/master' && github.event_name == 'push'
+      #   run: |
+      #     echo "${{ secrets.GHCR_TOKEN }}" | docker login git.carlpearson.net -u cwpearson --password-stdin
+      #     docker push ${{ env.SLUG }}:latest
+      #     docker push ${{ env.SLUG }}:${{ env.DATE }}
+
       - name: Deploy to Container Registry
         if: github.ref == 'refs/heads/master' && github.event_name == 'push'
         run: |
-          echo "${{ secrets.GHCR_TOKEN }}" | docker login git.carlpearson.net -u cwpearson --password-stdin
+          docker login git.carlpearson.net -u cwpearson
           docker push ${{ env.SLUG }}:latest
           docker push ${{ env.SLUG }}:${{ env.DATE }}