From f0f82b699403520f81f5d43d9470e36086ce1b8a Mon Sep 17 00:00:00 2001
From: Ramon Roche <mrpollo@gmail.com>
Date: Tue, 8 Feb 2022 15:45:59 -0800
Subject: [PATCH] github: import tagged image

---
 .github/workflows/build_docker.yml | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
index 54671284ed..83f083c0bf 100644
--- a/.github/workflows/build_docker.yml
+++ b/.github/workflows/build_docker.yml
@@ -58,17 +58,16 @@ jobs:
         uses: docker/build-push-action@v2
         id: docker_build
         with:
-          load: true
           file: Tools/setup/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ env.DOCKER_TAG }}
-          outputs: type=tar,dest=/tmp/px4image.tar
+          outputs: type=tar,dest=/tmp/px4_docker_image.tar
 
       - name: Save container to artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: px4image
-          path: /tmp/px4image.tar
+          name: px4_docker_image
+          path: /tmp/px4_docker_image.tar
 
       - name: Push to Github Registry
         uses: docker/build-push-action@v2
@@ -112,25 +111,18 @@ jobs:
       - name: Get container from artifacts
         uses: actions/download-artifact@v2
         with:
-          name: px4image
+          name: px4_docker_image
           path: /tmp
 
       - name: Load Docker image
         run: |
-          docker import /tmp/px4image.tar
+          docker import /tmp/px4_docker_image.tar ${{ env.DOCKER_TAG }}
           docker image ls -a
 
-      - name: Check disk space
-        run: |
-          df -h
-          docker buildx du
-          rm /tmp/px4image.tar
-          df -h
-
       - name: Checkout Code
         uses: actions/checkout@v2
 
-      - name: Build the world
+      - name: Build targets
         #run: |
           #docker run --rm -w "${GITHUB_ACTION_PATH}" \
             #--env=LOCAL_USER_ID="$(id -u)" \