From ba00aa6186e739d1bb82d8727efd5e41cf79021f Mon Sep 17 00:00:00 2001
From: Chris Jones <chris@cjones.org>
Date: Mon, 4 Mar 2024 16:24:27 -0700
Subject: [PATCH 1/4] Fix expression and container name.

---
 .gitea/workflows/docker.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml
index 680b5f0..df139e1 100644
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -22,11 +22,11 @@ jobs:
     - name: build
       run: docker build -t ${{ inputs.image_name }}:${{ github.run_number }} .
     - name: push
-      if: ${{ inputs.push }}
+      if: ${{ inputs.push  == true }}
       run: |
-        docker create --name ${{ inputs.image_name }}_${{ github.run_number }} ${{ inputs.image_name }}:${{ github.run_number }}
-        docker export -o /tmp/image ${{ inputs.image_name }}_${{ github.run_number }}
-        docker rm ${{ inputs.image_name }}_${{ github.run_number }}
+        docker create --name run_${{ github.run_number }} ${{ inputs.image_name }}:${{ github.run_number }}
+        docker export -o /tmp/image run_${{ github.run_number }}
+        docker rm run_${{ github.run_number }}
         docker rmi ${{ inputs.image_name }}:${{ github.run_number }}
         tar -x -C /tmp -f /tmp/image tag
         tag=$(cat /tmp/tag)
-- 
2.49.1


From 84dd05ec9bb6c7b3cc52bfdc6063d07caaee30fc Mon Sep 17 00:00:00 2001
From: Chris Jones <chris@cjones.org>
Date: Mon, 4 Mar 2024 16:30:47 -0700
Subject: [PATCH 2/4] Don't rmi.

---
 .gitea/workflows/docker.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml
index df139e1..0fe7492 100644
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -27,7 +27,6 @@ jobs:
         docker create --name run_${{ github.run_number }} ${{ inputs.image_name }}:${{ github.run_number }}
         docker export -o /tmp/image run_${{ github.run_number }}
         docker rm run_${{ github.run_number }}
-        docker rmi ${{ inputs.image_name }}:${{ github.run_number }}
         tar -x -C /tmp -f /tmp/image tag
         tag=$(cat /tmp/tag)
         docker tag ${{ inputs.image_name }}:${{ github.run_number }} ${{ inputs.image_name }}:$tag
-- 
2.49.1


From 21b4161bfe4e30a794156a7371e819cb856fa07d Mon Sep 17 00:00:00 2001
From: Chris Jones <chris@cjones.org>
Date: Mon, 4 Mar 2024 18:48:28 -0700
Subject: [PATCH 3/4] docker login

---
 .gitea/workflows/docker.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml
index 0fe7492..868eaba 100644
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -18,11 +18,14 @@ jobs:
   build:
     runs-on: cjyar-24
     steps:
+    - name: docker login
+      if: ${{ inputs.push == true }}
+      run: echo ${{ secrets.DOCKER_TOKEN }} | docker login -u cjyar --password-stdin
     - uses: actions/checkout@v4
     - name: build
       run: docker build -t ${{ inputs.image_name }}:${{ github.run_number }} .
     - name: push
-      if: ${{ inputs.push  == true }}
+      if: ${{ inputs.push == true }}
       run: |
         docker create --name run_${{ github.run_number }} ${{ inputs.image_name }}:${{ github.run_number }}
         docker export -o /tmp/image run_${{ github.run_number }}
-- 
2.49.1


From 7dab02b2e79a67c91909e7ed84e412e31e6f82f5 Mon Sep 17 00:00:00 2001
From: Chris Jones <chris@cjones.org>
Date: Mon, 4 Mar 2024 18:50:17 -0700
Subject: [PATCH 4/4] Docker login differently.

---
 .gitea/workflows/docker.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml
index 868eaba..06ae0f2 100644
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -20,7 +20,7 @@ jobs:
     steps:
     - name: docker login
       if: ${{ inputs.push == true }}
-      run: echo ${{ secrets.DOCKER_TOKEN }} | docker login -u cjyar --password-stdin
+      run: docker login -u cjyar -p "${{ secrets.DOCKER_TOKEN }}"
     - uses: actions/checkout@v4
     - name: build
       run: docker build -t ${{ inputs.image_name }}:${{ github.run_number }} .
-- 
2.49.1