From 15a4d96fbedbf4da966eb2e5258a832868bcdf42 Mon Sep 17 00:00:00 2001
From: Chris Jones <chris@cjones.org>
Date: Tue, 5 Mar 2024 02:57:13 +0000
Subject: [PATCH] Fix expression and container name. (#1)

Reviewed-on: https://git.cjones.org/chris/cicd/pulls/1
---
 .gitea/workflows/docker.yaml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml
index 680b5f0..06ae0f2 100644
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -18,16 +18,18 @@ jobs:
   build:
     runs-on: cjyar-24
     steps:
+    - name: docker login
+      if: ${{ inputs.push == true }}
+      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 }} .
     - 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 rmi ${{ 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 }}
         tar -x -C /tmp -f /tmp/image tag
         tag=$(cat /tmp/tag)
         docker tag ${{ inputs.image_name }}:${{ github.run_number }} ${{ inputs.image_name }}:$tag