From 9ae8172cabdc1fc8457da57578c0ec9f1f23bb36 Mon Sep 17 00:00:00 2001
From: Saijin-Naib <19295950+Saijin-Naib@users.noreply.github.com>
Date: Sun, 15 Nov 2020 22:29:36 -0500
Subject: [PATCH] Update build-container-and-wsl.yaml

Fix up changes to the workflow I accidentally up-streamed, and commented out lines I added, restoring original opendronemap/odm docker entries.

My branch remains in the comments for easy toggling on/off for testing as needed.
---
 .github/workflows/build-container-and-wsl.yaml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-container-and-wsl.yaml b/.github/workflows/build-container-and-wsl.yaml
index 8c57d44e..d7dab9c7 100644
--- a/.github/workflows/build-container-and-wsl.yaml
+++ b/.github/workflows/build-container-and-wsl.yaml
@@ -1,7 +1,7 @@
 name: Build and Release Container and WSL Image
 
 on:
-  workflow_dispatch:
+  #workflow_dispatch:
   push:
     branches:
     - master
@@ -28,7 +28,8 @@ jobs:
       id: docker_meta
       uses: crazy-max/ghaction-docker-meta@v1
       with:
-        images: synper311/odm
+        #images: synper311/odm
+        images: opendronemap/odm
         tag-edge: true
         tag-match-latest: \d{1,3}\.\d{1,3}\.\d\{1,3} # matches v1.2.3
     - name: Build and push Docker image
@@ -41,9 +42,14 @@ jobs:
         tags: ${{ steps.docker_meta.outputs.tags }}
     - name: Export WSL image
       id: wsl_export
-      run: |
-        docker pull synper311/odm
-        docker export $(docker create synper311/odm) --output odm-wsl-rootfs-amd64.tar.gz
+      #run: |
+        #docker pull synper311/odm
+        #docker export $(docker create synper311/odm) --output odm-wsl-rootfs-amd64.tar.gz
+        #gzip odm-wsl-rootfs-amd64.tar.gz
+        #echo ::set-output name=amd64-rootfs::"odm-wsl-rootfs-amd64.tar.gz"
+       run: |
+        docker pull opendronemap/odm
+        docker export $(docker create opendronemap/odm) --output odm-wsl-rootfs-amd64.tar.gz
         gzip odm-wsl-rootfs-amd64.tar.gz
         echo ::set-output name=amd64-rootfs::"odm-wsl-rootfs-amd64.tar.gz"
     # Convert tag into a GitHub Release if we're building a tag